feat: ability to deploy shared secret

cmd/deploy.go

@@ -93,11 +93,21 @@ func deploy(cmd *cobra.Command, args []string) error {
 
 	// filter configs with changed values
 	for _, c := range config.Configs {
+		found := false
 		for _, a := range all {
-			if c.Name == *a.Name && c.Value != *a.Value {
-				configsToDeploy = append(configsToDeploy, c)
+			if c.Name == *a.Name {
+				found = true
+
+				if c.Value != *a.Value {
+					configsToDeploy = append(configsToDeploy, c)
+				}
+				break
 			}
 		}
+
+		if !found {
+			configsToDeploy = append(configsToDeploy, c)
+		}
 	}
 
 	err = st.PutMany(configsToDeploy)
@@ -106,7 +116,7 @@ func deploy(cmd *cobra.Command, args []string) error {
 		return errors.Wrap(err, "failed to write params")
 	}
 
-	fmt.Printf("%d new configs deployed", len(configsToDeploy))
+	fmt.Printf("%d new configs deployed. service = %s, stage = %s", len(configsToDeploy), config.Service, stage)
 
 	return nil
 }

config/config.go

@@ -13,7 +13,7 @@ type rawConfig struct {
 	Service  string
 
 	Config map[string]map[string]string
-	Secret map[string]string
+	Secret map[string]map[string]string
 }
 
 type Config struct {
@@ -62,41 +62,46 @@ func Load(param LoadParam) (*Config, error) {
 }
 
 func parseConfig(rc rawConfig, c *Config, param LoadParam) {
-	temp := map[string]string{}
-	c.Configs = []store.ConfigInput{}
-
-	defaultConfig := rc.Config["defaults"]
-	sharedConfig := rc.Config["shared"]
-	envConfig := rc.Config[param.Stage]
-
-	for key, value := range defaultConfig {
-		temp[formatPath(param.Stage, c.Service, key)] = value
-	}
-
-	for key, value := range sharedConfig {
-		temp[formatSharedPath(param.Stage, key)] = value
+	for key, value := range rc.Config["defaults"] {
+		c.Configs = append(c.Configs, store.ConfigInput{
+			Name:   formatPath(param.Stage, c.Service, key),
+			Value:  value,
+			Secret: false,
+		})
 	}
 
-	for key, value := range envConfig {
-		temp[formatPath(param.Stage, c.Service, key)] = value
+	for key, value := range rc.Config["shared"] {
+		c.Configs = append(c.Configs, store.ConfigInput{
+			Name:   formatSharedPath(param.Stage, key),
+			Value:  value,
+			Secret: false,
+		})
 	}
 
-	for key, value := range temp {
+	for key, value := range rc.Config[param.Stage] {
 		c.Configs = append(c.Configs, store.ConfigInput{
-			Name:   key,
+			Name:   formatPath(param.Stage, c.Service, key),
 			Value:  value,
 			Secret: false,
 		})
 	}
 
-	for key, value := range rc.Secret {
+	for key, value := range rc.Secret["defaults"] {
 		c.Secrets = append(c.Secrets, store.ConfigInput{
 			Name:        formatPath(param.Stage, c.Service, key),
 			Description: value,
 			Secret:      true,
 		})
 	}
 
+	for key, value := range rc.Secret["shared"] {
+		c.Secrets = append(c.Secrets, store.ConfigInput{
+			Name:        formatSharedPath(param.Stage, key),
+			Description: value,
+			Secret:      true,
+		})
+	}
+
 	c.All = append(c.Secrets, c.Configs...)
 }
 

example/safebox.yml

@@ -18,5 +18,9 @@ config:
     SHARED_KEY: "shared key"
 
 secret:
-  API_KEY: "key of the api endpoint"
-  DB_SECRET: "database secret"
+  defaults:
+    API_KEY: "key of the api endpoint"
+    DB_SECRET: "database secret"
+
+  shared:
+    APOLLO_KEY: "apollo key"