more cleanup

cli/app/secret.go

@@ -20,19 +20,23 @@ import (
 	"github.com/urfave/cli"
 )
 
-var allSecrets bool
-var allSecretsFlag = &cli.BoolFlag{
-	Name:        "all, a",
-	Destination: &allSecrets,
-	Usage:       "Generate all secrets",
-}
+var (
+	allSecrets     bool
+	allSecretsFlag = &cli.BoolFlag{
+		Name:        "all, a",
+		Destination: &allSecrets,
+		Usage:       "Generate all secrets",
+	}
+)
 
-var rmAllSecrets bool
-var rmAllSecretsFlag = &cli.BoolFlag{
-	Name:        "all, a",
-	Destination: &rmAllSecrets,
-	Usage:       "Remove all secrets",
-}
+var (
+	rmAllSecrets     bool
+	rmAllSecretsFlag = &cli.BoolFlag{
+		Name:        "all, a",
+		Destination: &rmAllSecrets,
+		Usage:       "Remove all secrets",
+	}
+)
 
 var appSecretGenerateCommand = cli.Command{
 	Name:      "generate",
@@ -98,13 +102,11 @@ var appSecretGenerateCommand = cli.Command{
 			s, ok := secrets[secretName]
 			if !ok {
 				logrus.Fatalf("%s doesn't exist in the env config?", secretName)
-			} else {
-				s.Version = secretVersion
-				secrets = map[string]secret.SecretValue{
-					secretName: s,
-				}
 			}
-
+			s.Version = secretVersion
+			secrets = map[string]secret.SecretValue{
+				secretName: s,
+			}
 		}
 
 		cl, err := client.New(app.Server)

pkg/config/env.go

@@ -69,7 +69,7 @@ func ReadEnv(filePath string) (AppEnv, error) {
 	return envVars, nil
 }
 
-// ReadEnv loads an app envivornment into a map.
+// ReadEnv loads an app envivornment and their modifiers in two different maps.
 func ReadEnvWithModifiers(filePath string) (AppEnv, AppModifiers, error) {
 	var envVars AppEnv
 

pkg/secret/secret.go

@@ -6,7 +6,6 @@ package secret
 import (
 	"context"
 	"fmt"
-	"log"
 	"slices"
 	"strconv"
 	"strings"
@@ -111,19 +110,21 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, recipeName stri
 		secretVersion := secretConfig.Name[lastIdx+1:]
 		value := SecretValue{Version: secretVersion}
 
+		// Check if the length modifier is set for this secret.
 		for k, v := range appModifiers {
-			log.Println(configWithoutEnv.Secrets[secretId].Name, k)
-			if strings.Contains(configWithoutEnv.Secrets[secretId].Name, k) {
-				lengthRaw, ok := v["length"]
-				if ok {
-					length, err := strconv.Atoi(lengthRaw)
-					if err != nil {
-						return nil, err
-					}
-					value.Length = length
-				}
-				break
+			// configWithoutEnv contains the raw name as defined in the compose.yaml
+			if !strings.Contains(configWithoutEnv.Secrets[secretId].Name, k) {
+				continue
 			}
+			lengthRaw, ok := v["length"]
+			if ok {
+				length, err := strconv.Atoi(lengthRaw)
+				if err != nil {
+					return nil, err
+				}
+				value.Length = length
+			}
+			break
 		}
 		secretValues[secretId] = value
 	}
@@ -200,7 +201,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]SecretValue, ap
 		}
 	}
 
-	// logrus.Debugf("generated and stored %s on %s", secrets, server)
+	logrus.Debugf("generated and stored %v on %s", secrets, server)
 
 	return secretsGenerated, nil
 }