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

Add JSON validation to the aws_s3_bucket 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 12:54:59 +01:00
parent e8a7b5d1c6
commit a35695a804
No known key found for this signature in database
GPG Key ID: B89F6447B63419A6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resource_aws_s3_bucket.go
View File

@ -48,6 +48,7 @@ func resourceAwsS3Bucket() *schema.Resource {
"policy": &schema.Schema{ "policy": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ValidateFunc: validateJsonString,
DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs,
}, },
@ -112,7 +113,11 @@ func resourceAwsS3Bucket() *schema.Resource {
"routing_rules": &schema.Schema{ "routing_rules": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
StateFunc: normalizeJson, ValidateFunc: validateJsonString,
StateFunc: func(v interface{}) string {
json, _ := normalizeJsonString(v)
return json
},
}, },
}, },
}, },
@ -465,11 +470,14 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error {
if err := d.Set("policy", ""); err != nil { if err := d.Set("policy", ""); err != nil {
return err return err
} }
} else if err := d.Set("policy", normalizeJson(*v)); err != nil { } else {
policy, _ := normalizeJsonString(*v)
if err := d.Set("policy", policy); err != nil {
return err return err
} }
} }
} }
}
// Read the CORS // Read the CORS
cors, err := s3conn.GetBucketCors(&s3.GetBucketCorsInput{ cors, err := s3conn.GetBucketCors(&s3.GetBucketCorsInput{