Improve service command building

Netflix · Mar 26, 2021 · 9958376 · 9958376
1 parent e734974
commit 9958376
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cmd/service.go b/cmd/service.go
@@ -102,10 +102,12 @@ func initService() {
 
 	svcProgram = &program{}
 
-	args := []string{"service", "run"}
-	configArgs := viper.GetStringSlice("service.args")
-	if len(configArgs) > 0 {
-		args = append(args, configArgs...)
+	var args []string
+	for _, key := range []string{"service.flags", "service.args", "service.run"} {
+		configArgs := viper.GetStringSlice(key)
+		if len(configArgs) > 0 {
+			args = append(args, configArgs...)
+		}
 	}
 	svcConfig = &service.Config{
 		Name:        "weep",

diff --git a/config/config.go b/config/config.go
@@ -42,7 +42,8 @@ func init() {
 	viper.SetDefault("server.http_timeout", 20)
 	viper.SetDefault("server.address", "127.0.0.1")
 	viper.SetDefault("server.port", 9091)
-	viper.SetDefault("service.command", "ecs_credential_provider")
+	viper.SetDefault("service.command", "serve")
+	viper.SetDefault("service.run", []string{"service", "run"})
 	viper.SetDefault("service.args", []string{})
 	viper.SetDefault("service.flags", []string{})