Skip to content

Commit 35bb1a2

Browse files
authored
Merge pull request #33 from robvanoostenrijk/aws-china-arn
Add support for AWS China ARNs
2 parents a134c43 + c32cabf commit 35bb1a2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/secrets/aws/secrets.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (sp *SecretsProvider) ResolveSecrets(_ context.Context, vars []string) ([]s
5151
for _, env := range vars {
5252
kv := strings.Split(env, "=")
5353
key, value := kv[0], kv[1]
54-
if strings.HasPrefix(value, "arn:aws:secretsmanager") {
54+
if strings.HasPrefix(value, "arn:aws:secretsmanager") || strings.HasPrefix(value, "arn:aws-cn:secretsmanager") {
5555
// get secret value
5656
secret, err := sp.sm.GetSecretValue(&secretsmanager.GetSecretValueInput{SecretId: &value})
5757
if err != nil {
@@ -71,7 +71,7 @@ func (sp *SecretsProvider) ResolveSecrets(_ context.Context, vars []string) ([]s
7171
} else {
7272
env = key + "=" + *secret.SecretString
7373
}
74-
} else if strings.HasPrefix(value, "arn:aws:ssm") && strings.Contains(value, ":parameter/") {
74+
} else if (strings.HasPrefix(value, "arn:aws:ssm") || strings.HasPrefix(value, "arn:aws-cn:ssm")) && strings.Contains(value, ":parameter/") {
7575
tokens := strings.Split(value, ":")
7676
// valid parameter ARN arn:aws:ssm:REGION:ACCOUNT:parameter/PATH
7777
// or arn:aws:ssm:REGION:ACCOUNT:parameter/PATH:VERSION

0 commit comments

Comments
 (0)