diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go index 2d03772f..ca37c6eb 100644 --- a/pkg/secret/secret.go +++ b/pkg/secret/secret.go @@ -37,6 +37,9 @@ type Secret struct { // variable. For Example: // SECRET_FOO=v1 # charset=default,special Charset string + // Whether or not to skip generation of the secret or not + // For example: SECRET_FOO=v1 # generate=false + SkipGenerate bool // RemoteName is the name of the secret on the server. For example: // name: ${STACK_NAME}_test_pass_two_${SECRET_TEST_PASS_TWO_VERSION} // With the following: @@ -155,6 +158,13 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin value.Length = length } + generateRaw, ok := modifierValues["generate"] + if ok { + if generateRaw == "false" { + value.SkipGenerate = true + } + } + value.Charset = resolveCharset(modifierValues["charset"]) break } @@ -192,6 +202,12 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server go func(secretName string, secret Secret) { defer wg.Done() + if secret.SkipGenerate { + log.Debugf("skipping generation of %s (generate=false)", secretName) + ch <- nil + return + } + log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server) if secret.Length > 0 { diff --git a/tests/integration/app_secret.bats b/tests/integration/app_secret.bats index fe3cf5c2..11151c9a 100644 --- a/tests/integration/app_secret.bats +++ b/tests/integration/app_secret.bats @@ -182,6 +182,20 @@ teardown(){ assert_output --partial '10' # NOTE(d1): hardcoded # length=10 in recipe config } +@test "generate: skip if generate=false" { + run sed -i 's/COMPOSE_FILE="compose.yml"/COMPOSE_FILE="compose.yml:compose.skip_pass.yml"/g' \ + "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" + assert_success + + run sed -i 's/#SECRET_TEST_SKIP_PASS_VERSION=v1/SECRET_TEST_SKIP_PASS_VERSION=v1/g' \ + "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" + assert_success + + run $ABRA app secret generate "$TEST_APP_DOMAIN" --all + assert_success + refute_output --partial 'test_skip_pass' +} + @test "insert: validate arguments" { run $ABRA app secret insert assert_failure