maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reduce use of magic strings

Browse source
This commit is contained in:
Luke Hoban 2019-09-06 17:45:00 -07:00
parent ad287b844b
commit 801f1bbf45
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/crypto.go
View file

@ -23,6 +23,7 @@ import (
"github.com/pulumi/pulumi/pkg/backend/httpstate"
"github.com/pulumi/pulumi/pkg/resource/config"
"github.com/pulumi/pulumi/pkg/secrets"
"github.com/pulumi/pulumi/pkg/secrets/passphrase"
)
func getStackEncrypter(s backend.Stack) (config.Encrypter, error) {
@ -49,7 +50,7 @@ func getStackSecretsManager(s backend.Stack) (secrets.Manager, error) {
return nil, err
}
if ps.SecretsProvider != "default" && ps.SecretsProvider != "passphrase" && ps.SecretsProvider != "" {
if ps.SecretsProvider != passphrase.Type && ps.SecretsProvider != "default" && ps.SecretsProvider != "" {
return newCloudSecretsManager(s.Ref().Name(), stackConfigFile, ps.SecretsProvider)
}

5
cmd/util.go
View file

@ -41,6 +41,7 @@ import (
"github.com/pulumi/pulumi/pkg/backend/state"
"github.com/pulumi/pulumi/pkg/diag/colors"
"github.com/pulumi/pulumi/pkg/engine"
"github.com/pulumi/pulumi/pkg/secrets/passphrase"
"github.com/pulumi/pulumi/pkg/util/cancel"
"github.com/pulumi/pulumi/pkg/util/ciutil"
"github.com/pulumi/pulumi/pkg/util/cmdutil"
@ -109,9 +110,9 @@ func createStack(
isDefaultSecretsProvider := secretsProvider == "" || secretsProvider == "default"
if _, ok := b.(filestate.Backend); ok && isDefaultSecretsProvider {
// The default when using the filestate backend is the passphrase secrets provider
secretsProvider = "passphrase"
secretsProvider = passphrase.Type
}
if secretsProvider == "passphrase" {
if secretsProvider == passphrase.Type {
if _, pharseErr := newPassphraseSecretsManager(stackRef.Name(), stackConfigFile); pharseErr != nil {
return nil, pharseErr
}