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

provider/aws: Fix crash in AWS S3 Bucket when website index/error is empty (#6269)

This commit is contained in:
Clint 2016-04-21 08:07:01 -05:00
parent 77f5648c42
commit bc68dee2eb
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -871,7 +871,12 @@ func resourceAwsS3BucketWebsiteUpdate(s3conn *s3.S3, d *schema.ResourceData) err
ws := d.Get("website").([]interface{}) ws := d.Get("website").([]interface{})
if len(ws) == 1 { if len(ws) == 1 {
w := ws[0].(map[string]interface{}) var w map[string]interface{}
if ws[0] != nil {
w = ws[0].(map[string]interface{})
} else {
w = make(map[string]interface{})
}
return resourceAwsS3BucketWebsitePut(s3conn, d, w) return resourceAwsS3BucketWebsitePut(s3conn, d, w)
} else if len(ws) == 0 { } else if len(ws) == 0 {
return resourceAwsS3BucketWebsiteDelete(s3conn, d) return resourceAwsS3BucketWebsiteDelete(s3conn, d)
@ -883,10 +888,19 @@ func resourceAwsS3BucketWebsiteUpdate(s3conn *s3.S3, d *schema.ResourceData) err
func resourceAwsS3BucketWebsitePut(s3conn *s3.S3, d *schema.ResourceData, website map[string]interface{}) error { func resourceAwsS3BucketWebsitePut(s3conn *s3.S3, d *schema.ResourceData, website map[string]interface{}) error {
bucket := d.Get("bucket").(string) bucket := d.Get("bucket").(string)
indexDocument := website["index_document"].(string) var indexDocument, errorDocument, redirectAllRequestsTo, routingRules string
errorDocument := website["error_document"].(string) if v, ok := website["index_document"]; ok {
redirectAllRequestsTo := website["redirect_all_requests_to"].(string) indexDocument = v.(string)
routingRules := website["routing_rules"].(string) }
if v, ok := website["error_document"]; ok {
errorDocument = v.(string)
}
if v, ok := website["redirect_all_requests_to"]; ok {
redirectAllRequestsTo = v.(string)
}
if v, ok := website["routing_rules"]; ok {
routingRules = v.(string)
}
if indexDocument == "" && redirectAllRequestsTo == "" { if indexDocument == "" && redirectAllRequestsTo == "" {
return fmt.Errorf("Must specify either index_document or redirect_all_requests_to.") return fmt.Errorf("Must specify either index_document or redirect_all_requests_to.")