diff --git a/cmd/frostfs-adm/internal/modules/morph/root.go b/cmd/frostfs-adm/internal/modules/morph/root.go index a33a99ef..603ea23a 100644 --- a/cmd/frostfs-adm/internal/modules/morph/root.go +++ b/cmd/frostfs-adm/internal/modules/morph/root.go @@ -108,7 +108,7 @@ var ( forceNewEpoch = &cobra.Command{ Use: "force-new-epoch", - Short: "Create new NeoFS epoch event in the side chain", + Short: "Create new FrostFS epoch event in the side chain", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) @@ -130,7 +130,7 @@ var ( setConfig = &cobra.Command{ Use: "set-config key1=val1 [key2=val2 ...]", DisableFlagsInUseLine: true, - Short: "Add/update global config value in the NeoFS network", + Short: "Add/update global config value in the FrostFS network", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) @@ -164,7 +164,7 @@ var ( dumpNetworkConfigCmd = &cobra.Command{ Use: "dump-config", - Short: "Dump NeoFS network config", + Short: "Dump FrostFS network config", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) }, @@ -182,7 +182,7 @@ var ( updateContractsCmd = &cobra.Command{ Use: "update-contracts", - Short: "Update NeoFS contracts", + Short: "Update FrostFS contracts", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) @@ -192,7 +192,7 @@ var ( dumpContainersCmd = &cobra.Command{ Use: "dump-containers", - Short: "Dump NeoFS containers to file", + Short: "Dump FrostFS containers to file", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) }, @@ -201,7 +201,7 @@ var ( restoreContainersCmd = &cobra.Command{ Use: "restore-containers", - Short: "Restore NeoFS containers from file", + Short: "Restore FrostFS containers from file", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) @@ -211,7 +211,7 @@ var ( listContainersCmd = &cobra.Command{ Use: "list-containers", - Short: "List NeoFS containers", + Short: "List FrostFS containers", PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) }, @@ -236,8 +236,8 @@ func init() { RootCmd.AddCommand(initCmd) initCmd.Flags().String(alphabetWalletsFlag, "", "Path to alphabet wallets dir") initCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint") - initCmd.Flags().String(contractsInitFlag, "", "Path to archive with compiled NeoFS contracts (default fetched from latest github release)") - initCmd.Flags().Uint(epochDurationCLIFlag, 240, "Amount of side chain blocks in one NeoFS epoch") + initCmd.Flags().String(contractsInitFlag, "", "Path to archive with compiled FrostFS contracts (default fetched from latest github release)") + initCmd.Flags().Uint(epochDurationCLIFlag, 240, "Amount of side chain blocks in one FrostFS epoch") initCmd.Flags().Uint(maxObjectSizeCLIFlag, 67108864, "Max single object size in bytes") initCmd.Flags().Bool(homomorphicHashDisabledCLIFlag, false, "Disable object homomorphic hashing") // Defaults are taken from neo-preodolenie. @@ -289,7 +289,7 @@ func init() { RootCmd.AddCommand(updateContractsCmd) updateContractsCmd.Flags().String(alphabetWalletsFlag, "", "Path to alphabet wallets dir") updateContractsCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint") - updateContractsCmd.Flags().String(contractsInitFlag, "", "Path to archive with compiled NeoFS contracts (default fetched from latest github release)") + updateContractsCmd.Flags().String(contractsInitFlag, "", "Path to archive with compiled FrostFS contracts (default fetched from latest github release)") RootCmd.AddCommand(dumpContainersCmd) dumpContainersCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint") diff --git a/cmd/frostfs-adm/internal/modules/morph/subnet.go b/cmd/frostfs-adm/internal/modules/morph/subnet.go index d3d4719c..cb5f03ed 100644 --- a/cmd/frostfs-adm/internal/modules/morph/subnet.go +++ b/cmd/frostfs-adm/internal/modules/morph/subnet.go @@ -39,7 +39,7 @@ func viperBindFlags(cmd *cobra.Command, flags ...string) { // subnet command section. var cmdSubnet = &cobra.Command{ Use: "subnet", - Short: "NeoFS subnet management", + Short: "FrostFS subnet management", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, endpointFlag, @@ -112,7 +112,7 @@ func readSubnetKey(key *keys.PrivateKey) error { // create subnet command. var cmdSubnetCreate = &cobra.Command{ Use: "create", - Short: "Create NeoFS subnet", + Short: "Create FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetWallet, @@ -177,7 +177,7 @@ var errZeroSubnet = errors.New("zero subnet") // remove subnet command. var cmdSubnetRemove = &cobra.Command{ Use: "remove", - Short: "Remove NeoFS subnet", + Short: "Remove FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetWallet, @@ -226,7 +226,7 @@ const ( // get subnet command. var cmdSubnetGet = &cobra.Command{ Use: "get", - Short: "Read information about the NeoFS subnet", + Short: "Read information about the FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetGetID, @@ -290,7 +290,7 @@ const ( // command to manage subnet admins. var cmdSubnetAdmin = &cobra.Command{ Use: "admin", - Short: "Manage administrators of the NeoFS subnet", + Short: "Manage administrators of the FrostFS subnet", PreRun: func(cmd *cobra.Command, args []string) { viperBindFlags(cmd, flagSubnetWallet, @@ -397,7 +397,7 @@ func manageSubnetAdmins(cmd *cobra.Command, rm bool) error { // command to add subnet admin. var cmdSubnetAdminAdd = &cobra.Command{ Use: "add", - Short: "Add admin to the NeoFS subnet", + Short: "Add admin to the FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetAdminAddGroup, @@ -412,7 +412,7 @@ var cmdSubnetAdminAdd = &cobra.Command{ // command to remove subnet admin. var cmdSubnetAdminRemove = &cobra.Command{ Use: "remove", - Short: "Remove admin of the NeoFS subnet", + Short: "Remove admin of the FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetAdminClient, @@ -433,7 +433,7 @@ const ( // command to manage subnet clients. var cmdSubnetClient = &cobra.Command{ Use: "client", - Short: "Manage clients of the NeoFS subnet", + Short: "Manage clients of the FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetWallet, @@ -516,7 +516,7 @@ func manageSubnetClients(cmd *cobra.Command, rm bool) error { // command to add subnet client. var cmdSubnetClientAdd = &cobra.Command{ Use: "add", - Short: "Add client to the NeoFS subnet", + Short: "Add client to the FrostFS subnet", RunE: func(cmd *cobra.Command, _ []string) error { return manageSubnetClients(cmd, false) }, @@ -525,7 +525,7 @@ var cmdSubnetClientAdd = &cobra.Command{ // command to remove subnet client. var cmdSubnetClientRemove = &cobra.Command{ Use: "remove", - Short: "Remove client of the NeoFS subnet", + Short: "Remove client of the FrostFS subnet", RunE: func(cmd *cobra.Command, _ []string) error { return manageSubnetClients(cmd, true) }, @@ -598,7 +598,7 @@ func manageSubnetNodes(cmd *cobra.Command, rm bool) error { // command to manage subnet nodes. var cmdSubnetNode = &cobra.Command{ Use: "node", - Short: "Manage nodes of the NeoFS subnet", + Short: "Manage nodes of the FrostFS subnet", PreRun: func(cmd *cobra.Command, _ []string) { viperBindFlags(cmd, flagSubnetWallet, @@ -611,7 +611,7 @@ var cmdSubnetNode = &cobra.Command{ // command to add subnet node. var cmdSubnetNodeAdd = &cobra.Command{ Use: "add", - Short: "Add node to the NeoFS subnet", + Short: "Add node to the FrostFS subnet", RunE: func(cmd *cobra.Command, _ []string) error { return manageSubnetNodes(cmd, false) }, @@ -620,7 +620,7 @@ var cmdSubnetNodeAdd = &cobra.Command{ // command to remove subnet node. var cmdSubnetNodeRemove = &cobra.Command{ Use: "remove", - Short: "Remove node from the NeoFS subnet", + Short: "Remove node from the FrostFS subnet", RunE: func(cmd *cobra.Command, _ []string) error { return manageSubnetNodes(cmd, true) }, @@ -693,7 +693,7 @@ func init() { _ = cmdSubnetClient.MarkFlagRequired(flagSubnetClientSubnet) clientFlags.String(flagSubnetClientGroup, "", "ID of the client group to work with") _ = cmdSubnetClient.MarkFlagRequired(flagSubnetClientGroup) - clientFlags.String(flagSubnetClientID, "", "Client's user ID in NeoFS system in text format") + clientFlags.String(flagSubnetClientID, "", "Client's user ID in FrostFS system in text format") _ = cmdSubnetClient.MarkFlagRequired(flagSubnetClientID) clientFlags.StringP(flagSubnetWallet, "w", "", "Path to file with wallet") _ = cmdSubnetClient.MarkFlagRequired(flagSubnetWallet) diff --git a/cmd/frostfs-adm/internal/modules/root.go b/cmd/frostfs-adm/internal/modules/root.go index cbb3b03b..5563d1bb 100644 --- a/cmd/frostfs-adm/internal/modules/root.go +++ b/cmd/frostfs-adm/internal/modules/root.go @@ -16,9 +16,9 @@ import ( var ( rootCmd = &cobra.Command{ Use: "frostfs-adm", - Short: "NeoFS Administrative Tool", - Long: `NeoFS Administrative Tool provides functions to setup and -manage NeoFS network deployment.`, + Short: "FrostFS Administrative Tool", + Long: `FrostFS Administrative Tool provides functions to setup and +manage FrostFS network deployment.`, RunE: entryPoint, SilenceUsage: true, } diff --git a/cmd/frostfs-adm/internal/modules/storagecfg/config.go b/cmd/frostfs-adm/internal/modules/storagecfg/config.go index 1efe0751..435f79df 100644 --- a/cmd/frostfs-adm/internal/modules/storagecfg/config.go +++ b/cmd/frostfs-adm/internal/modules/storagecfg/config.go @@ -14,7 +14,7 @@ node: relay: {{ .Relay }} # start Storage node in relay mode without bootstrapping into the Network map subnet: exit_zero: false # toggle entrance to zero subnet (overrides corresponding attribute and occurrence in entries) - entries: [] # list of IDs of subnets to enter in a text format of NeoFS API protocol (overrides corresponding attributes) + entries: [] # list of IDs of subnets to enter in a text format of FrostFS API protocol (overrides corresponding attributes) grpc: num: 1 # total number of listener endpoints