add default config file itself into search path

Signed-off-by: Yee Hing Tong <[email protected]>
flyteorg · Oct 11, 2023 · 676d096 · 676d096
1 parent 579fe3d
commit 676d096
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/flyteartifacts/artifact_config.yaml b/flyteartifacts/artifact_config.yaml
@@ -0,0 +1,2 @@
+artifactsServer:
+  myTestValue: "test from file"
diff --git a/flyteartifacts/cmd/main.go b/flyteartifacts/cmd/main.go
@@ -69,16 +69,20 @@ func init() {
 }
 
 func initConfig(flags *pflag.FlagSet) error {
-	fmt.Println("initConfig called")
 	configAccessor = viper.NewAccessor(config.Options{
-		SearchPaths: []string{cfgFile, ".", "/etc/flyte/config", "$GOPATH/src/github.com/flyteorg/flyte/flyteartifacts"},
+		SearchPaths: []string{cfgFile, "./artifact_config.yaml", ".", "/etc/flyte/config", "$GOPATH/src/github.com/flyteorg/flyte/flyteartifacts"},
 		StrictMode:  false,
 	})
 
 	logger.Infof(context.TODO(), "Using config file: %v", configAccessor.ConfigFilesUsed())
 
 	configAccessor.InitializePflags(flags)
-	fmt.Println("initConfig finish")
+
+	err := flag.CommandLine.Parse([]string{})
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(-1)
+	}
 
 	return configAccessor.UpdateConfig(context.TODO())
 }

diff --git a/flyteartifacts/pkg/configuration/config.go b/flyteartifacts/pkg/configuration/config.go
@@ -10,4 +10,8 @@ type ApplicationConfiguration struct {
 	MyTestValue string `json:"myTestValue" pflag:",Test config value"`
 }
 
-var ApplicationConfig = config.MustRegisterSection(artifactsServer, &ApplicationConfiguration{})
+var defaultApplicationConfiguration = ApplicationConfiguration{
+	MyTestValue: "default",
+}
+
+var ApplicationConfig = config.MustRegisterSection(artifactsServer, &defaultApplicationConfiguration)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		artifactsServer:
		myTestValue: "test from file"