From ba956f340ad1e31bf0b6d1a697f1f899cebe7d1c Mon Sep 17 00:00:00 2001
From: Rich M <r.p.makepeace@gmail.com>
Date: Sat, 6 Apr 2024 21:11:31 +0100
Subject: [PATCH] Attempted rework to match new code.

---
 cli/app/new.go            |  4 ----
 cli/app/secret.go         |  4 ----
 pkg/secret/secret.go      | 26 +++++++-------------------
 pkg/secret/secret_test.go | 11 +++++++++++
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/cli/app/new.go b/cli/app/new.go
index 97821037..cdc713ab 100644
--- a/cli/app/new.go
+++ b/cli/app/new.go
@@ -127,10 +127,6 @@ var appNewCommand = cli.Command{
 				return err
 			}
 
-			if err := secret.EnsureSecretLengths(secretsConfig, internal.Domain, sanitisedAppName); err != nil {
-				logrus.Fatal(err)
-			}
-
 			if err := promptForSecrets(recipe.Name, secretsConfig); err != nil {
 				logrus.Fatal(err)
 			}
diff --git a/cli/app/secret.go b/cli/app/secret.go
index 9002ef8c..3b491055 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -96,10 +96,6 @@ var appSecretGenerateCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		if err := secret.EnsureSecretLengths(secrets, internal.Domain, config.SanitiseAppName(app.Name)); err != nil {
-			logrus.Fatal(err)
-		}
-
 		if !allSecrets {
 			secretName := c.Args().Get(1)
 			secretVersion := c.Args().Get(2)
diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go
index fa73f812..f574a033 100644
--- a/pkg/secret/secret.go
+++ b/pkg/secret/secret.go
@@ -89,7 +89,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	appEnv["STACK_NAME"] = stackName
 
 	opts := stack.Deploy{Composefiles: composeFiles}
-	config, err := loader.LoadComposefile(opts, appEnv)
+	composeConfig, err := loader.LoadComposefile(opts, appEnv)
 	if err != nil {
 		return nil, err
 	}
@@ -100,7 +100,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	}
 
 	var enabledSecrets []string
-	for _, service := range config.Services {
+	for _, service := range composeConfig.Services {
 		for _, secret := range service.Secrets {
 			enabledSecrets = append(enabledSecrets, secret.Source)
 		}
@@ -112,7 +112,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	}
 
 	secretValues := map[string]Secret{}
-	for secretId, secretConfig := range config.Secrets {
+	for secretId, secretConfig := range composeConfig.Secrets {
 		if string(secretConfig.Name[len(secretConfig.Name)-1]) == "_" {
 			return nil, fmt.Errorf("missing version for secret? (%s)", secretId)
 		}
@@ -126,6 +126,10 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 		secretVersion := secretConfig.Name[lastIdx+1:]
 		value := Secret{Version: secretVersion, RemoteName: secretConfig.Name}
 
+		if len(value.RemoteName) > config.MAX_DOCKER_SECRET_LENGTH {
+			return nil, fmt.Errorf("secret %s is > %d chars when combined with %s", secretId, config.MAX_DOCKER_SECRET_LENGTH, stackName)
+		}
+
 		// Check if the length modifier is set for this secret.
 		for envName, modifierValues := range appModifiers {
 			// configWithoutEnv contains the raw name as defined in the compose.yaml
@@ -282,19 +286,3 @@ func PollSecretsStatus(cl *dockerClient.Client, app config.App) (secretStatuses,
 
 	return secStats, nil
 }
-
-func EnsureSecretLengths(secrets map[string]Secret, domainName string, sanitisedAppName string) error {
-	if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
-		sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
-	}
-
-	domainAndFormatLength := len(sanitisedAppName) + 4
-	for secretName := range secrets {
-
-		if len(secretName)+domainAndFormatLength > config.MAX_DOCKER_SECRET_LENGTH {
-			return fmt.Errorf("secret %s is too long (> %d chars when combined with %s)", secretName, config.MAX_DOCKER_SECRET_LENGTH, sanitisedAppName)
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/secret/secret_test.go b/pkg/secret/secret_test.go
index fc10c098..f2830d2e 100644
--- a/pkg/secret/secret_test.go
+++ b/pkg/secret/secret_test.go
@@ -28,3 +28,14 @@ func TestReadSecretsConfig(t *testing.T) {
 	assert.Equal(t, "v2", secretsFromConfig["test_pass_three"].Version)
 	assert.Equal(t, 0, secretsFromConfig["test_pass_three"].Length)
 }
+
+func TestReadSecretsConfigWithLongDomain(t *testing.T) {
+	composeFiles := []string{"./testdir/compose.yaml"}
+	_, err := ReadSecretsConfig("./testdir/.env.sample", composeFiles, "should_break_on_forty_eight_char_stack_nameeeeee")
+	if err == nil {
+		t.Fatal("Expected to fail")
+	}
+
+	// Check error
+	assert.Equal(t, "secret test_pass_one is > 64 chars when combined with should_break_on_forty_eight_char_stack_nameeeeee", err.Error())
+}