ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add JSON validation to the aws_kms_key resource. 

This commit adds support for new helper function which is used to
normalise and validate JSON string.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
This commit is contained in:
Krzysztof Wilczynski 2016-09-14 17:29:38 +01:00
parent e8a7b5d1c6
commit 0d68f6545d
No known key found for this signature in database
GPG Key ID: B89F6447B63419A6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/aws/resource_aws_kms_key.go
View File

@ -55,6 +55,7 @@ func resourceAwsKmsKey() *schema.Resource {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true, Computed: true,
ValidateFunc: validateJsonString,
DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs,
}, },
"is_enabled": &schema.Schema{ "is_enabled": &schema.Schema{
@ -143,7 +144,8 @@ func resourceAwsKmsKeyRead(d *schema.ResourceData, meta interface{}) error {
return err return err
} }
d.Set("policy", normalizeJson(*p.Policy)) policy, _ := normalizeJsonString(*p.Policy)
d.Set("policy", policy)
krs, err := conn.GetKeyRotationStatus(&kms.GetKeyRotationStatusInput{ krs, err := conn.GetKeyRotationStatus(&kms.GetKeyRotationStatusInput{
KeyId: metadata.KeyId, KeyId: metadata.KeyId,
@ -216,14 +218,14 @@ func resourceAwsKmsKeyDescriptionUpdate(conn *kms.KMS, d *schema.ResourceData) e
} }
func resourceAwsKmsKeyPolicyUpdate(conn *kms.KMS, d *schema.ResourceData) error { func resourceAwsKmsKeyPolicyUpdate(conn *kms.KMS, d *schema.ResourceData) error {
policy := d.Get("policy").(string) policy, _ := normalizeJsonString(d.Get("policy").(string))
keyId := d.Get("key_id").(string) keyId := d.Get("key_id").(string)
log.Printf("[DEBUG] KMS key: %s, update policy: %s", keyId, policy) log.Printf("[DEBUG] KMS key: %s, update policy: %s", keyId, policy)
req := &kms.PutKeyPolicyInput{ req := &kms.PutKeyPolicyInput{
KeyId: aws.String(keyId), KeyId: aws.String(keyId),
Policy: aws.String(normalizeJson(policy)), Policy: aws.String(policy),
PolicyName: aws.String("default"), PolicyName: aws.String("default"),
} }
_, err := conn.PutKeyPolicy(req) _, err := conn.PutKeyPolicy(req)