From 562bd6541b3d9ac422c0e83b88d00008e6004d08 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Fri, 1 May 2015 09:37:02 -0400 Subject: [PATCH] providers/aws: Use explicit returns in websiteEndpoint --- builtin/providers/aws/resource_aws_s3_bucket.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go index 04cd987457..c5e3b51fd2 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket.go +++ b/builtin/providers/aws/resource_aws_s3_bucket.go @@ -217,11 +217,11 @@ func resourceAwsS3BucketWebsiteDelete(s3conn *s3.S3, d *schema.ResourceData) err 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 // endpoint if len(d.Get("website").([]interface{})) == 0 { - return + return "", nil } bucket := d.Get("bucket").(string) @@ -233,7 +233,7 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (endpoint string, er }, ) if err != nil { - return + return "", err } var region string if location.LocationConstraint != nil { @@ -245,7 +245,7 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (endpoint string, er 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 }