toolshed/abra
4
2
Fork 18
Code Issues 25 Pull Requests 2 Packages Releases 41 Activity

Switch to using const for max sanitised app length.

Browse Source
This commit is contained in:
Rich M
2023-10-04 18:58:20 +01:00
parent 2583fe2861
commit f85a3e40aa
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/app/new.go
View File

@ -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