Add pflag binding and fix loading of config (flyteorg#135)

robert-ulbrich-mercedes-benz · Jul 2, 2024 · 55d90ed · 55d90ed
1 parent 3397942
commit 55d90ed
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 209 deletions.
diff --git a/flytectl/cmd/config/config.go b/flytectl/cmd/config/config.go
@@ -9,11 +9,12 @@ import (
 	"github.com/flyteorg/flytectl/pkg/printer"
 )
 
-//go:generate pflags Config --bind-default-var
-
 var (
-	defaultConfig = &Config{}
-	section       = config.MustRegisterSection("root", defaultConfig)
+	defaultConfig = &Config{
+		Output: printer.OutputFormatTABLE.String(),
+	}
+
+	section = config.MustRegisterSection("root", defaultConfig)
 )
 
 // Config hold configration for flytectl flag

diff --git a/flytectl/cmd/config/config_flags.go b/flytectl/cmd/config/config_flags.go
diff --git a/flytectl/cmd/config/config_flags_test.go b/flytectl/cmd/config/config_flags_test.go
diff --git a/flytectl/cmd/root.go b/flytectl/cmd/root.go
@@ -47,6 +47,8 @@ func newRootCmd() *cobra.Command {
 
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file (default is $HOME/.flyte/config.yaml)")
 
+	configAccessor.InitializePflags(rootCmd.PersistentFlags())
+
 	// Due to https://github.com/flyteorg/flyte/issues/341, project flag will have to be specified as
 	// --root.project, this adds a convenience on top to allow --project to be used
 	rootCmd.PersistentFlags().StringVarP(&(config.GetConfig().Project), "project", "p", "", "Specifies the Flyte project.")
@@ -69,19 +71,30 @@ func newRootCmd() *cobra.Command {
 	return rootCmd
 }
 
-func initConfig(_ *cobra.Command, _ []string) error {
+func initConfig(cmd *cobra.Command, _ []string) error {
 	configFile := f.FilePathJoin(f.UserHomeDir(), configFileDir, configFileName)
 	if len(os.Getenv("FLYTECTL_CONFIG")) > 0 {
 		configFile = os.Getenv("FLYTECTL_CONFIG")
 	}
+
 	if len(cfgFile) > 0 {
 		configFile = cfgFile
 	}
+
 	configAccessor = viper.NewAccessor(stdConfig.Options{
 		StrictMode:  true,
 		SearchPaths: []string{configFile},
 	})
 
+	// persistent flags were initially bound to the root command so we must bind to the same command to avoid
+	// overriding those initial ones. We need to traverse up to the root command and initialize pflags for that.
+	rootCmd := cmd
+	for rootCmd.Parent() != nil {
+		rootCmd = rootCmd.Parent()
+	}
+
+	configAccessor.InitializePflags(rootCmd.PersistentFlags())
+
 	err := configAccessor.UpdateConfig(context.TODO())
 	if err != nil {
 		return err

diff --git a/flytectl/config.yaml b/flytectl/config.yaml
@@ -2,6 +2,7 @@ admin:
   # For GRPC endpoints you might want to use dns:///flyte.myexample.com
   endpoint: dns:///localhost:30081
   insecure: true
+  authType: Pkce
 logger:
   show-source: true
   level: 0

diff --git a/flytectl/go.mod b/flytectl/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/enescakir/emoji v1.0.0
 	github.com/flyteorg/flyteidl v0.19.9
-	github.com/flyteorg/flytestdlib v0.3.24
+	github.com/flyteorg/flytestdlib v0.3.28
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/protobuf v1.4.3
 	github.com/google/go-cmp v0.5.6 // indirect

diff --git a/flytectl/go.sum b/flytectl/go.sum
@@ -342,8 +342,8 @@ github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4
 github.com/flyteorg/flyteidl v0.19.9 h1:1j4/YbV/G1m2hrK017F9K0JYZYxCCwf4qtEkiNnUiEw=
 github.com/flyteorg/flyteidl v0.19.9/go.mod h1:576W2ViEyjTpT+kEVHAGbrTP3HARNUZ/eCwrNPmdx9U=
 github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220=
-github.com/flyteorg/flytestdlib v0.3.24 h1:Eu5TMKch9ihOavPKufgTBI677eVYjJpOAPPg9hfZIzU=
-github.com/flyteorg/flytestdlib v0.3.24/go.mod h1:1XG0DwYTUm34Yrffm1Qy9Tdr/pWQypEqTq5dUxw3/cM=
+github.com/flyteorg/flytestdlib v0.3.28 h1:bvyldApjlUy9ETxSFpYvLhYLJxxndnMZTf93rVG6a00=
+github.com/flyteorg/flytestdlib v0.3.28/go.mod h1:7cDWkY3v7xsoesFcDdu6DSW5Q2U2W5KlHUbUHSwBG1Q=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=