Fix embedded flags issue when running Dependency Manager flags manual…

…ly (#1530) * Fix embedded flags issue * Run lint fix * Use sconfig * Run goimport fix --------- Co-authored-by: Chase Fleming <[email protected]>
onflow · Apr 22, 2024 · a42acab · a42acab
1 parent 57889d4
commit a42acab
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/internal/dependencymanager/add.go b/internal/dependencymanager/add.go
@@ -30,11 +30,13 @@ import (
 )
 
 type addFlagsCollection struct {
-	dependencyManagerFlagsCollection
-	name string `default:"" flag:"name" info:"Name of the dependency"`
+	*dependencyManagerFlagsCollection
+	name string
 }
 
-var addFlags = addFlagsCollection{}
+var addFlags = addFlagsCollection{
+	dependencyManagerFlagsCollection: &dependencyManagerFlagsCollection{},
+}
 
 var addCommand = &command.Command{
 	Cmd: &cobra.Command{
@@ -43,8 +45,14 @@ var addCommand = &command.Command{
 		Example: "flow dependencies add testnet://0afe396ebc8eee65.FlowToken",
 		Args:    cobra.ExactArgs(1),
 	},
-	Flags: &addFlags,
-	RunS:  add,
+	RunS: add,
+}
+
+func init() {
+	// Add common flags.
+	addFlags.dependencyManagerFlagsCollection.AddToCommand(addCommand.Cmd)
+	// Add command-specific flags.
+	addCommand.Cmd.Flags().StringVar(&addFlags.name, "name", "", "Name of the dependency")
 }
 
 func add(
@@ -58,7 +66,7 @@ func add(
 
 	dep := args[0]
 
-	installer, err := NewDependencyInstaller(logger, state, addFlags.dependencyManagerFlagsCollection)
+	installer, err := NewDependencyInstaller(logger, state, *addFlags.dependencyManagerFlagsCollection)
 	if err != nil {
 		logger.Error(fmt.Sprintf("Error: %v", err))
 		return nil, err

diff --git a/internal/dependencymanager/dependencyinstaller.go b/internal/dependencymanager/dependencyinstaller.go
@@ -26,6 +26,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/psiemens/sconfig"
+
+	"github.com/spf13/cobra"
+
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	flowGo "github.com/onflow/flow-go/model/flow"
 
@@ -74,6 +78,17 @@ type dependencyManagerFlagsCollection struct {
 	skipAlias       bool `default:"false" flag:"skip-alias" info:"Skip prompting for an alias"`
 }
 
+func (f *dependencyManagerFlagsCollection) AddToCommand(cmd *cobra.Command) {
+	err := sconfig.New(f).
+		FromEnvironment(util.EnvPrefix).
+		BindFlags(cmd.Flags()).
+		Parse()
+
+	if err != nil {
+		panic(err)
+	}
+}
+
 type DependencyInstaller struct {
 	Gateways        map[string]gateway.Gateway
 	Logger          output.Logger