kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5533 from justinsb/hotfix_5522 

Check errors when parsing JSON on IAM policies
This commit is contained in:
k8s-ci-robot 2018-07-27 12:20:56 -07:00 committed by GitHub
parent 31f961f212 3ddf598448
commit d7486e490f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/model/iam.go
View File

@ -187,7 +187,10 @@ func (b *IAMModelBuilder) buildIAMTasks(igRole kops.InstanceGroupRole, iamName s
}
statements := make([]*iam.Statement, 0)
json.Unmarshal([]byte(additionalPolicy), &statements)
if err := json.Unmarshal([]byte(additionalPolicy), &statements); err != nil {
return fmt.Errorf("additionalPolicy %q is invalid: %v", strings.ToLower(string(igRole)), err)
}
p.Statement = append(p.Statement, statements...)
policy, err := p.AsJSON()