coop-cloud/abra
coop-cloud
/
abra
5
2
Fork 15
Code Issues Pull Requests 5 Packages Releases 36 Activity

Attempt to fix post merge problems.
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Rich M 2024-04-06 11:42:16 +01:00
parent 296bed9704
commit eea47f9099
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/new.go
View File

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

7
cli/app/secret.go
View File

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

2
pkg/secret/secret.go
View File

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