Merge branch 'main' into julien/extensions

ignite · Aug 2, 2024 · deb9f16 · deb9f16
2 parents e38e58a + 3152cf5
commit deb9f16
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -45,6 +45,7 @@
 - [#4000](https://github.com/ignite/cli/pull/4000) Run all dry runners before the wet run in the `xgenny` pkg
 - [#4091](https://github.com/ignite/cli/pull/4091) Fix race conditions in the plugin logic
 - [#4128](https://github.com/ignite/cli/pull/4128) Check for duplicate proto fields in config
+- [#4286](https://github.com/ignite/cli/pull/4286) Add missing verbose mode flags
 
 ## [`v28.5.0`](https://github.com/ignite/cli/releases/tag/v28.5.0)
 

diff --git a/go.mod b/go.mod
@@ -200,7 +200,7 @@ require (
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/docker/cli v26.1.2+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v26.1.2+incompatible // indirect
+	github.com/docker/docker v26.1.4+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect

diff --git a/go.sum b/go.sum
@@ -416,8 +416,8 @@ github.com/docker/cli v26.1.2+incompatible h1:/MWZpUMMlr1hCGyquL8QNbL1hbivQ1kLuT
 github.com/docker/cli v26.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v26.1.2+incompatible h1:UVX5ZOrrfTGZZYEP+ZDq3Xn9PdHNXaSYMFPDumMqG2k=
-github.com/docker/docker v26.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
+github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
 github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

diff --git a/ignite/cmd/chain_build.go b/ignite/cmd/chain_build.go
@@ -88,12 +88,12 @@ for your current environment.
 	c.Flags().AddFlagSet(flagSetCheckDependencies())
 	c.Flags().AddFlagSet(flagSetSkipProto())
 	c.Flags().AddFlagSet(flagSetDebug())
+	c.Flags().AddFlagSet(flagSetVerbose())
 	c.Flags().Bool(flagRelease, false, "build for a release")
 	c.Flags().StringSliceP(flagReleaseTargets, "t", []string{}, "release targets. Available only with --release flag")
 	c.Flags().StringSlice(flagBuildTags, []string{}, "parameters to build the chain binary")
 	c.Flags().String(flagReleasePrefix, "", "tarball prefix for each release target. Available only with --release flag")
 	c.Flags().StringP(flagOutput, "o", "", "binary output path")
-	c.Flags().BoolP("verbose", "v", false, "verbose output")
 
 	return c
 }

diff --git a/ignite/cmd/chain_faucet.go b/ignite/cmd/chain_faucet.go
@@ -30,10 +30,7 @@ func chainFaucetHandler(cmd *cobra.Command, args []string) error {
 	var (
 		toAddress = args[0]
 		coins     = args[1]
-		session   = cliui.New(
-			cliui.WithVerbosity(getVerbosity(cmd)),
-			cliui.StartSpinner(),
-		)
+		session   = cliui.New(cliui.StartSpinner())
 	)
 	defer session.End()
 

diff --git a/ignite/cmd/chain_init.go b/ignite/cmd/chain_init.go
@@ -88,6 +88,7 @@ commands manually to ensure a production-level node initialization.
 	c.Flags().AddFlagSet(flagSetCheckDependencies())
 	c.Flags().AddFlagSet(flagSetSkipProto())
 	c.Flags().AddFlagSet(flagSetDebug())
+	c.Flags().AddFlagSet(flagSetVerbose())
 	c.Flags().StringSlice(flagBuildTags, []string{}, "parameters to build the chain binary")
 
 	return c

diff --git a/ignite/cmd/chain_lint.go b/ignite/cmd/chain_lint.go
@@ -15,9 +15,7 @@ func NewChainLint() *cobra.Command {
 		Long:  "The lint command runs the golangci-lint tool to lint the codebase.",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			session := cliui.New(
-				cliui.StartSpinnerWithText("Linting..."),
-			)
+			session := cliui.New(cliui.StartSpinnerWithText("Linting..."))
 			defer session.End()
 
 			chainOption := []chain.Option{

diff --git a/ignite/cmd/chain_serve.go b/ignite/cmd/chain_serve.go
@@ -16,6 +16,7 @@ import (
 )
 
 const (
+	flagVerbose         = "verbose"
 	flagConfig          = "config"
 	flagForceReset      = "force-reset"
 	flagGenerateClients = "generate-clients"
@@ -70,7 +71,7 @@ production, you may want to run "appd start" manually.
 	c.Flags().AddFlagSet(flagSetHome())
 	c.Flags().AddFlagSet(flagSetCheckDependencies())
 	c.Flags().AddFlagSet(flagSetSkipProto())
-	c.Flags().BoolP("verbose", "v", false, "verbose output")
+	c.Flags().AddFlagSet(flagSetVerbose())
 	c.Flags().BoolP(flagForceReset, "f", false, "force reset of the app state on start and every source change")
 	c.Flags().BoolP(flagResetOnce, "r", false, "reset the app state once on init")
 	c.Flags().Bool(flagGenerateClients, false, "generate code for the configured clients on reset or source code change")

diff --git a/ignite/cmd/cmd.go b/ignite/cmd/cmd.go
@@ -109,8 +109,14 @@ To get started, create a blockchain:
 	}, nil
 }
 
+func flagSetVerbose() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	fs.BoolP(flagVerbose, "v", false, "verbose output")
+	return fs
+}
+
 func getVerbosity(cmd *cobra.Command) uilog.Verbosity {
-	if verbose, _ := cmd.Flags().GetBool("verbose"); verbose {
+	if verbose, _ := cmd.Flags().GetBool(flagVerbose); verbose {
 		return uilog.VerbosityVerbose
 	}