diff --git a/cli/app/new.go b/cli/app/new.go index 7a3d6970..4c3d4243 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -172,9 +172,9 @@ type AppSecrets map[string]string // createSecrets creates all secrets for a new app. func createSecrets(cl *dockerClient.Client, secretsConfig map[string]string, sanitisedAppName string) (AppSecrets, error) { // NOTE(d1): trim to match app.StackName() implementation - if len(sanitisedAppName) > 45 { - logrus.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:45]) - sanitisedAppName = sanitisedAppName[:45] + if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH { + logrus.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]) + sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH] } secrets, err := secret.GenerateSecrets(cl, secretsConfig, sanitisedAppName, internal.NewAppServer) @@ -262,8 +262,8 @@ func ensureServerFlag() error { } func ensureSecretLengths(secrets map[string]string, domainName string, sanitisedAppName string) error { - if len(sanitisedAppName) > 45 { - sanitisedAppName = sanitisedAppName[:45] + if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH { + sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH] } domainAndFormatLength := len(sanitisedAppName) + 4 diff --git a/pkg/config/app.go b/pkg/config/app.go index 95dc7784..15e7d972 100644 --- a/pkg/config/app.go +++ b/pkg/config/app.go @@ -57,9 +57,9 @@ func (a App) StackName() string { stackName := SanitiseAppName(a.Name) - if len(stackName) > 45 { - logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:45]) - stackName = stackName[:45] + if len(stackName) > MAX_SANITISED_APP_NAME_LENGTH { + logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:MAX_SANITISED_APP_NAME_LENGTH]) + stackName = stackName[:MAX_SANITISED_APP_NAME_LENGTH] } a.Env["STACK_NAME"] = stackName diff --git a/pkg/config/env.go b/pkg/config/env.go index 0874fb57..98891880 100644 --- a/pkg/config/env.go +++ b/pkg/config/env.go @@ -34,6 +34,8 @@ var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud" var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json" var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git" +const MAX_SANITISED_APP_NAME_LENGTH = 45 + // GetServers retrieves all servers. func GetServers() ([]string, error) { var servers []string