TrueCloudLab/frostfs-node
18
1
Fork 27
Code Issues 94 Pull requests 3 Projects Releases 1 Activity Actions

[#244] Remove --local-dump from frostfs-adm config #505

Merged
fyrchik merged 1 commit from ale64bit/frostfs-node:fix/244-remove-local-dump-config into master 2023-07-18 13:51:26 +00:00
Conversation 1 Commits 1 Files changed 3 +4 -6
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/frostfs-adm/internal/modules/morph/initialize.go
View file

@ -210,11 +210,11 @@ func validateInit(cmd *cobra.Command) error {
func createClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet) (Client, error) { func createClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet) (Client, error) {
var c Client var c Client
var err error var err error
if v.GetString(localDumpFlag) != "" { if ldf := cmd.Flags().Lookup(localDumpFlag); ldf != nil && ldf.Changed {
fyrchik marked this conversation as resolved Outdated
fyrchik commented 2023-07-18 13:15:09 +00:00
Outdated
Review
Copy link

Why not cmd.Flags().GetString()?
Also, can we still provide both via CLI? The error should occur (we only allow conflict if rpc-endpoint is provided via the configuration).

Why not `cmd.Flags().GetString()`? Also, can we still provide both _via CLI_? The error should occur (we only allow conflict if rpc-endpoint is provided via the configuration).
ale64bit commented 2023-07-18 13:33:23 +00:00
Outdated
Review
Copy link

Why not cmd.Flags().GetString()?

Because it forces me to introduce an err variable which shadows the external one and it's not different from this anyway.

Also, can we still provide both via CLI? The error should occur (we only allow conflict if rpc-endpoint is provided via the configuration).

done

> Why not cmd.Flags().GetString()? Because it forces me to introduce an `err` variable which shadows the external one and it's not different from this anyway. > Also, can we still provide both via CLI? The error should occur (we only allow conflict if rpc-endpoint is provided via the configuration). done
if v.GetString(endpointFlag) != "" { if cmd.Flags().Changed(endpointFlag) {
return nil, fmt.Errorf("`%s` and `%s` flags are mutually exclusive", endpointFlag, localDumpFlag) return nil, fmt.Errorf("`%s` and `%s` flags are mutually exclusive", endpointFlag, localDumpFlag)
} }
c, err = newLocalClient(cmd, v, wallets) c, err = newLocalClient(cmd, v, wallets, ldf.Value.String())
} else { } else {
c, err = getN3Client(v) c, err = getN3Client(v)
} }

3
cmd/frostfs-adm/internal/modules/morph/local_client.go
View file

@ -51,7 +51,7 @@ type localClient struct {
maxGasInvoke int64 maxGasInvoke int64
} }
func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet) (*localClient, error) { func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet, dumpPath string) (*localClient, error) {
cfg, err := config.LoadFile(v.GetString(protoConfigPath)) cfg, err := config.LoadFile(v.GetString(protoConfigPath))
if err != nil { if err != nil {
return nil, err return nil, err
@ -87,7 +87,6 @@ func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet
go bc.Run() go bc.Run()
dumpPath := v.GetString(localDumpFlag)
if cmd.Name() != "init" { if cmd.Name() != "init" {
f, err := os.OpenFile(dumpPath, os.O_RDONLY, 0600) f, err := os.OpenFile(dumpPath, os.O_RDONLY, 0600)
if err != nil { if err != nil {

1
cmd/frostfs-adm/internal/modules/morph/root.go
View file

@ -77,7 +77,6 @@ var (
_ = viper.BindPFlag(containerAliasFeeInitFlag, cmd.Flags().Lookup(containerAliasFeeCLIFlag)) _ = viper.BindPFlag(containerAliasFeeInitFlag, cmd.Flags().Lookup(containerAliasFeeCLIFlag))
_ = viper.BindPFlag(withdrawFeeInitFlag, cmd.Flags().Lookup(withdrawFeeCLIFlag)) _ = viper.BindPFlag(withdrawFeeInitFlag, cmd.Flags().Lookup(withdrawFeeCLIFlag))
_ = viper.BindPFlag(protoConfigPath, cmd.Flags().Lookup(protoConfigPath)) _ = viper.BindPFlag(protoConfigPath, cmd.Flags().Lookup(protoConfigPath))
_ = viper.BindPFlag(localDumpFlag, cmd.Flags().Lookup(localDumpFlag))
}, },
RunE: initializeSideChainCmd, RunE: initializeSideChainCmd,
} }