From eea47f9099c6b7590bd4ee7fa1c7557ad05a11e9 Mon Sep 17 00:00:00 2001 From: Rich M Date: Sat, 6 Apr 2024 11:42:16 +0100 Subject: [PATCH] Attempt to fix post merge problems. --- cli/app/new.go | 2 +- cli/app/secret.go | 7 ++----- pkg/secret/secret.go | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cli/app/new.go b/cli/app/new.go index 5511ef67..97821037 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -193,7 +193,7 @@ func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secr sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH] } - secrets, err := secret.GenerateSecrets(cl, secretsConfig, sanitisedAppName, internal.NewAppServer) + secrets, err := secret.GenerateSecrets(cl, secretsConfig, internal.NewAppServer) if err != nil { return nil, err } diff --git a/cli/app/secret.go b/cli/app/secret.go index 5f782f46..9002ef8c 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -96,14 +96,11 @@ var appSecretGenerateCommand = cli.Command{ logrus.Fatal(err) } - if err := secret.EnsureSecretLengths(secretsConfig, internal.Domain, config.SanitiseAppName(app.Name)); err != nil { + if err := secret.EnsureSecretLengths(secrets, internal.Domain, config.SanitiseAppName(app.Name)); err != nil { logrus.Fatal(err) } - secretsToCreate := make(map[string]string) - if allSecrets { - secretsToCreate = secretsConfig - } else { + if !allSecrets { secretName := c.Args().Get(1) secretVersion := c.Args().Get(2) s, ok := secrets[secretName] diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go index d15f302d..fa73f812 100644 --- a/pkg/secret/secret.go +++ b/pkg/secret/secret.go @@ -283,7 +283,7 @@ func PollSecretsStatus(cl *dockerClient.Client, app config.App) (secretStatuses, return secStats, nil } -func EnsureSecretLengths(secrets map[string]string, domainName string, sanitisedAppName string) error { +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] }