Skip to content

Commit b6baaa7

Browse files
committed
chore: MEC-1478 try to fix test
1 parent 2b9afa2 commit b6baaa7

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

pkg/k8ssecret/secret.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,28 @@ func GenerateK8SSecret(
9393
}
9494

9595
if cs.Spec.Data != nil {
96+
var iamrole string
97+
if cs.Spec.AWSAccountID != nil {
98+
iamrole = fmt.Sprintf("arn:aws:iam::%s:role/secret-syncer", *cs.Spec.AWSAccountID)
99+
} else {
100+
iamrole = *cs.Spec.IAMRole
101+
}
96102
for _, field := range cs.Spec.Data {
97103
if field.Value != nil {
98104
data[*field.Name] = []byte(*field.Value)
99105
}
100106

101107
if field.ValueFrom != nil {
102108
if field.ValueFrom.SecretRef != nil {
103-
AWSSecretValue, err := secretValueGetter(*field.ValueFrom.SecretRef.Name, *cs.Spec.IAMRole)
109+
AWSSecretValue, err := secretValueGetter(*field.ValueFrom.SecretRef.Name, iamrole)
104110
if err != nil {
105111
return nil, err
106112
}
107113
data[*field.Name] = []byte(AWSSecretValue)
108114
}
109115

110116
if field.ValueFrom.SecretKeyRef != nil {
111-
AWSSecretValue, err := secretValueGetter(*field.ValueFrom.SecretKeyRef.Name, *cs.Spec.IAMRole)
117+
AWSSecretValue, err := secretValueGetter(*field.ValueFrom.SecretKeyRef.Name, iamrole)
112118
if err != nil {
113119
return nil, err
114120
}
@@ -123,10 +129,10 @@ func GenerateK8SSecret(
123129
tpl := template.New(cs.Name)
124130
tpl = tpl.Funcs(template.FuncMap{
125131
"getSecretValue": func(secretID string) (string, error) {
126-
return secretValueGetter(secretID, *cs.Spec.IAMRole)
132+
return secretValueGetter(secretID, iamrole)
127133
},
128134
"getSecretValueMap": func(secretID string) (map[string]interface{}, error) {
129-
raw, err := secretValueGetter(secretID, *cs.Spec.IAMRole)
135+
raw, err := secretValueGetter(secretID, iamrole)
130136
if err != nil {
131137
return nil, fmt.Errorf("failed retrieving value for secret %s", secretID)
132138
}

0 commit comments

Comments
 (0)