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

providers/aws: Use explicit returns in websiteEndpoint

This commit is contained in:
Justin Campbell 2015-05-01 09:37:02 -04:00
parent 30f737c781
commit 562bd6541b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,11 +217,11 @@ func resourceAwsS3BucketWebsiteDelete(s3conn *s3.S3, d *schema.ResourceData) err
return nil return nil
} }
func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (endpoint string, err error) { func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (string, error) {
// If the bucket doesn't have a website configuration, return an empty // If the bucket doesn't have a website configuration, return an empty
// endpoint // endpoint
if len(d.Get("website").([]interface{})) == 0 { if len(d.Get("website").([]interface{})) == 0 {
return return "", nil
} }
bucket := d.Get("bucket").(string) bucket := d.Get("bucket").(string)
@ -233,7 +233,7 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (endpoint string, er
}, },
) )
if err != nil { if err != nil {
return return "", err
} }
var region string var region string
if location.LocationConstraint != nil { if location.LocationConstraint != nil {
@ -245,7 +245,7 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (endpoint string, er
region = "us-east-1" region = "us-east-1"
} }
endpoint = fmt.Sprintf("%s.s3-website-%s.amazonaws.com", bucket, region) endpoint := fmt.Sprintf("%s.s3-website-%s.amazonaws.com", bucket, region)
return return endpoint, nil
} }