fix(server/cmd)!: set environment prefix (#10950)
## Description Add `envPrefix` parameter to server's `cmd.Execute` method allowing chains to set custom `envPrefix`. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [x] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
30de6ddbeb
commit
033e5f3076
|
@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
|
|
||||||
### API Breaking Changes
|
### API Breaking Changes
|
||||||
|
|
||||||
|
* [\#10950](https://github.com/cosmos/cosmos-sdk/pull/10950) Add `envPrefix` parameter to `cmd.Execute`.
|
||||||
* (x/mint) [\#10441](https://github.com/cosmos/cosmos-sdk/pull/10441) The `NewAppModule` function now accepts an inflation calculation function as an argument.
|
* (x/mint) [\#10441](https://github.com/cosmos/cosmos-sdk/pull/10441) The `NewAppModule` function now accepts an inflation calculation function as an argument.
|
||||||
* [\#10295](https://github.com/cosmos/cosmos-sdk/pull/10295) Remove store type aliases from /types
|
* [\#10295](https://github.com/cosmos/cosmos-sdk/pull/10295) Remove store type aliases from /types
|
||||||
* [\#9695](https://github.com/cosmos/cosmos-sdk/pull/9695) Migrate keys from `Info` -> `Record`
|
* [\#9695](https://github.com/cosmos/cosmos-sdk/pull/9695) Migrate keys from `Info` -> `Record`
|
||||||
|
|
|
@ -17,7 +17,7 @@ import (
|
||||||
// server context object with the appropriate server and client objects injected
|
// server context object with the appropriate server and client objects injected
|
||||||
// into the underlying stdlib Context. It also handles adding core CLI flags,
|
// into the underlying stdlib Context. It also handles adding core CLI flags,
|
||||||
// specifically the logging flags. It returns an error upon execution failure.
|
// specifically the logging flags. It returns an error upon execution failure.
|
||||||
func Execute(rootCmd *cobra.Command, defaultHome string) error {
|
func Execute(rootCmd *cobra.Command, envPrefix string, defaultHome string) error {
|
||||||
// Create and set a client.Context on the command's Context. During the pre-run
|
// Create and set a client.Context on the command's Context. During the pre-run
|
||||||
// of the root command, a default initialized client.Context is provided to
|
// of the root command, a default initialized client.Context is provided to
|
||||||
// seed child command execution with values such as AccountRetriver, Keyring,
|
// seed child command execution with values such as AccountRetriver, Keyring,
|
||||||
|
@ -32,6 +32,6 @@ func Execute(rootCmd *cobra.Command, defaultHome string) error {
|
||||||
rootCmd.PersistentFlags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic)")
|
rootCmd.PersistentFlags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic)")
|
||||||
rootCmd.PersistentFlags().String(flags.FlagLogFormat, tmlog.LogFormatPlain, "The logging format (json|plain)")
|
rootCmd.PersistentFlags().String(flags.FlagLogFormat, tmlog.LogFormatPlain, "The logging format (json|plain)")
|
||||||
|
|
||||||
executor := tmcli.PrepareBaseCmd(rootCmd, "", defaultHome)
|
executor := tmcli.PrepareBaseCmd(rootCmd, envPrefix, defaultHome)
|
||||||
return executor.ExecuteContext(ctx)
|
return executor.ExecuteContext(ctx)
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,5 +20,5 @@ func TestInitCmd(t *testing.T) {
|
||||||
fmt.Sprintf("--%s=%s", cli.FlagOverwrite, "true"), // Overwrite genesis.json, in case it already exists
|
fmt.Sprintf("--%s=%s", cli.FlagOverwrite, "true"), // Overwrite genesis.json, in case it already exists
|
||||||
})
|
})
|
||||||
|
|
||||||
require.NoError(t, svrcmd.Execute(rootCmd, simapp.DefaultNodeHome))
|
require.NoError(t, svrcmd.Execute(rootCmd, "", simapp.DefaultNodeHome))
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import (
|
||||||
func main() {
|
func main() {
|
||||||
rootCmd, _ := cmd.NewRootCmd()
|
rootCmd, _ := cmd.NewRootCmd()
|
||||||
|
|
||||||
if err := svrcmd.Execute(rootCmd, simapp.DefaultNodeHome); err != nil {
|
if err := svrcmd.Execute(rootCmd, "", simapp.DefaultNodeHome); err != nil {
|
||||||
switch e := err.(type) {
|
switch e := err.(type) {
|
||||||
case server.ErrorCode:
|
case server.ErrorCode:
|
||||||
os.Exit(e.Code)
|
os.Exit(e.Code)
|
||||||
|
|
Loading…
Reference in New Issue