Skip to content

Fix unsafe-reset-all for working with default home#9103

Merged
cmwaters merged 2 commits intotendermint:mainfrom
rootwarp:unsafe-reset-all
Jul 27, 2022
Merged

Fix unsafe-reset-all for working with default home#9103
cmwaters merged 2 commits intotendermint:mainfrom
rootwarp:unsafe-reset-all

Conversation

@rootwarp
Copy link
Contributor

@rootwarp rootwarp commented Jul 27, 2022

Ref. #9102
close #9102

tendermint unsafe-reset-all command should clear client's home directory
but this command is not working with default home flags.

Ad described #9102, unsafe-reset-all command try to clear #HOME/data directory by default
where is not client's home.

To resolve this issue, ParseConfig function explicitly get client's home
and set it into config.

cmwaters
cmwaters reviewed Jul 27, 2022
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, could you rebase your PR against main instead of v0.34.x

@rootwarp rootwarp changed the base branch from v0.34.x to main July 27, 2022 08:18
@rootwarp
Copy link
Contributor Author

rootwarp commented Jul 27, 2022

Thanks for the fix, could you rebase your PR against main instead of v0.34.x

Fixed :)

@cmwaters cmwaters added the S:backport-to-v0.34.x Tell mergify to backport the PR to v0.34.x label Jul 27, 2022
cmwaters
cmwaters approved these changes Jul 27, 2022
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great thanks!

cmd/tendermint/commands/root.go
// ParseConfig retrieves the default environment configuration,
// sets up the Tendermint root and ensures that the root exists
func ParseConfig() (*cfg.Config, error) {
func ParseConfig(cmd *cobra.Command) (*cfg.Config, error) {
Copy link
Contributor

@cmwaters cmwaters Jul 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be better to pass the home path string instead of an entire command but we can clean this up in a later PR

Copy link
Contributor Author

@rootwarp rootwarp Jul 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for your comment. I'll clean this up on next issue.

@cmwaters
Copy link
Contributor

cmwaters commented Jul 27, 2022

There seems to be a failure in one of the integration tests. I wonder if you need to let viper know the path to read the config from. Something like this:

func ParseConfig(cmd *cobra.Command) (*cfg.Config, error) {
        home, err := cmd.Flags().GetString(cli.HomeFlag)
	if err != nil {
		return nil, err
	}

	// name of config file (without extension)
	viper.SetConfigName("config")
	// search root directory
	viper.AddConfigPath(home)
	// search root directory /config
	viper.AddConfigPath(filepath.Join(home, defaultConfigDir))

        conf := cfg.DefaultConfig()
	err := viper.Unmarshal(conf)
	if err != nil {
		return nil, err
	}

	conf.RootDir = home
        ...

@rootwarp
Copy link
Contributor Author

rootwarp commented Jul 27, 2022

There seems to be a failure in one of the integration tests. I wonder if you need to let viper know the path to read the config from. Something like this:

func ParseConfig(cmd *cobra.Command) (*cfg.Config, error) {
        home, err := cmd.Flags().GetString(cli.HomeFlag)
	if err != nil {
		return nil, err
	}

	// name of config file (without extension)
	viper.SetConfigName("config")
	// search root directory
	viper.AddConfigPath(home)
	// search root directory /config
	viper.AddConfigPath(filepath.Join(home, defaultConfigDir))

        conf := cfg.DefaultConfig()
	err := viper.Unmarshal(conf)
	if err != nil {
		return nil, err
	}

	conf.RootDir = home
        ...

Sorry my bad, I should to test before push PR.
I fixed code to pass test. TMHOME also should be accepted for home directory.

@cmwaters cmwaters merged commit 18c7e3a into tendermint:main Jul 27, 2022
@rootwarp rootwarp mentioned this pull request Jul 27, 2022
Closed
@rootwarp rootwarp deleted the unsafe-reset-all branch July 27, 2022 16:04
cmwaters pushed a commit that referenced this pull request Jul 27, 2022
@rootwarp @cmwaters
Fix unsafe-reset-all for working with default home (#9103)
5810d2a
cmwaters added a commit that referenced this pull request Aug 1, 2022
@cmwaters
backport: Fix unsafe-reset-all for working with default home (#9103) (#…
708a62f 
…9113)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ebuchman ebuchman Awaiting requested review from ebuchman

@tychoish tychoish Awaiting requested review from tychoish

@williambanfield williambanfield Awaiting requested review from williambanfield

@creachadair creachadair Awaiting requested review from creachadair

@thanethomson thanethomson Awaiting requested review from thanethomson

@sergio-mena sergio-mena Awaiting requested review from sergio-mena

@jmalicevic jmalicevic Awaiting requested review from jmalicevic

1 more reviewer

@cmwaters cmwaters cmwaters approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

S:backport-to-v0.34.x Tell mergify to backport the PR to v0.34.x

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rootwarp @cmwaters