Merge in master and fix conflicts

.gitignore

@@ -32,4 +32,5 @@ website/vendor
 
 # Keep windows files with windows line endings
 *.winfile eol=crlf
-/.vs
+/.vs
+node_modules

.gometalinter.json

@@ -1,13 +1,16 @@
 {
     "Deadline": "5m",
     "Enable": [
+        "deadcode",
         "errcheck",
         "gofmt",
         "ineffassign",
         "interfacer",
         "misspell",
         "structcheck",
         "unconvert",
+        "unparam",
+        "unused",
         "varcheck",
         "vet"
     ],

GNUmakefile

@@ -27,6 +27,9 @@ fmt:
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 
+websitefmtcheck:
+	@sh -c "'$(CURDIR)/scripts/websitefmtcheck.sh'"
+
 lint:
 	@echo "==> Checking source code against linters..."
 	@gometalinter ./$(PKG_NAME)

aws/autoscaling_tags.go

@@ -58,8 +58,8 @@ func setAutoscalingTags(conn *autoscaling.AutoScaling, d *schema.ResourceData) e
 
 	if d.HasChange("tag") || d.HasChange("tags") {
 		oraw, nraw := d.GetChange("tag")
-		o := setToMapByKey(oraw.(*schema.Set), "key")
-		n := setToMapByKey(nraw.(*schema.Set), "key")
+		o := setToMapByKey(oraw.(*schema.Set))
+		n := setToMapByKey(nraw.(*schema.Set))
 
 		old, err := autoscalingTagsFromMap(o, resourceID)
 		if err != nil {
@@ -248,36 +248,6 @@ func autoscalingTagFromMap(attr map[string]interface{}, resourceID string) (*aut
 	return t, nil
 }
 
-// autoscalingTagsToMap turns the list of tags into a map.
-func autoscalingTagsToMap(ts []*autoscaling.Tag) map[string]interface{} {
-	tags := make(map[string]interface{})
-	for _, t := range ts {
-		tag := map[string]interface{}{
-			"key":                 *t.Key,
-			"value":               *t.Value,
-			"propagate_at_launch": *t.PropagateAtLaunch,
-		}
-		tags[*t.Key] = tag
-	}
-
-	return tags
-}
-
-// autoscalingTagDescriptionsToMap turns the list of tags into a map.
-func autoscalingTagDescriptionsToMap(ts *[]*autoscaling.TagDescription) map[string]map[string]interface{} {
-	tags := make(map[string]map[string]interface{})
-	for _, t := range *ts {
-		tag := map[string]interface{}{
-			"key":                 *t.Key,
-			"value":               *t.Value,
-			"propagate_at_launch": *t.PropagateAtLaunch,
-		}
-		tags[*t.Key] = tag
-	}
-
-	return tags
-}
-
 // autoscalingTagDescriptionsToSlice turns the list of tags into a slice.
 func autoscalingTagDescriptionsToSlice(ts []*autoscaling.TagDescription) []map[string]interface{} {
 	tags := make([]map[string]interface{}, 0, len(ts))
@@ -292,11 +262,11 @@ func autoscalingTagDescriptionsToSlice(ts []*autoscaling.TagDescription) []map[s
 	return tags
 }
 
-func setToMapByKey(s *schema.Set, key string) map[string]interface{} {
+func setToMapByKey(s *schema.Set) map[string]interface{} {
 	result := make(map[string]interface{})
 	for _, rawData := range s.List() {
 		data := rawData.(map[string]interface{})
-		result[data[key].(string)] = data
+		result[data["key"].(string)] = data
 	}
 
 	return result

aws/autoscaling_tags_test.go

@@ -156,3 +156,33 @@ func TestIgnoringTagsAutoscaling(t *testing.T) {
 		}
 	}
 }
+
+// autoscalingTagsToMap turns the list of tags into a map.
+func autoscalingTagsToMap(ts []*autoscaling.Tag) map[string]interface{} {
+	tags := make(map[string]interface{})
+	for _, t := range ts {
+		tag := map[string]interface{}{
+			"key":                 *t.Key,
+			"value":               *t.Value,
+			"propagate_at_launch": *t.PropagateAtLaunch,
+		}
+		tags[*t.Key] = tag
+	}
+
+	return tags
+}
+
+// autoscalingTagDescriptionsToMap turns the list of tags into a map.
+func autoscalingTagDescriptionsToMap(ts *[]*autoscaling.TagDescription) map[string]map[string]interface{} {
+	tags := make(map[string]map[string]interface{})
+	for _, t := range *ts {
+		tag := map[string]interface{}{
+			"key":                 *t.Key,
+			"value":               *t.Value,
+			"propagate_at_launch": *t.PropagateAtLaunch,
+		}
+		tags[*t.Key] = tag
+	}
+
+	return tags
+}

aws/awserr.go

@@ -19,12 +19,13 @@ func isAWSErr(err error, code string, message string) bool {
 	return false
 }
 
-// Returns true if the error matches all these conditions:
+// IsAWSErrExtended returns true if the error matches all conditions
 //  * err is of type awserr.Error
 //  * Error.Code() matches code
 //  * Error.Message() contains message
 //  * Error.OrigErr() contains origErrMessage
-func isAWSErrExtended(err error, code string, message string, origErrMessage string) bool {
+// Note: This function will be moved out of the aws package in the future.
+func IsAWSErrExtended(err error, code string, message string, origErrMessage string) bool {
 	if !isAWSErr(err, code, message) {
 		return false
 	}
@@ -48,7 +49,9 @@ func retryOnAwsCode(code string, f func() (interface{}, error)) (interface{}, er
 	return resp, err
 }
 
-func retryOnAwsCodes(codes []string, f func() (interface{}, error)) (interface{}, error) {
+// RetryOnAwsCodes retries AWS error codes for one minute
+// Note: This function will be moved out of the aws package in the future.
+func RetryOnAwsCodes(codes []string, f func() (interface{}, error)) (interface{}, error) {
 	var resp interface{}
 	err := resource.Retry(1*time.Minute, func() *resource.RetryError {
 		var err error

aws/cloudfront_distribution_configuration_structure.go

@@ -56,7 +56,7 @@ func expandDistributionConfig(d *schema.ResourceData) *cloudfront.DistributionCo
 		distributionConfig.CacheBehaviors = expandCacheBehaviorsDeprecated(d.Get("cache_behavior").(*schema.Set))
 	}
 	// This sets CallerReference if it's still pending computation (ie: new resource)
-	if v, ok := d.GetOk("caller_reference"); ok == false {
+	if v, ok := d.GetOk("caller_reference"); !ok {
 		distributionConfig.CallerReference = aws.String(time.Now().Format(time.RFC3339Nano))
 	} else {
 		distributionConfig.CallerReference = aws.String(v.(string))
@@ -524,7 +524,7 @@ func lambdaFunctionAssociationHash(v interface{}) int {
 	var buf bytes.Buffer
 	m := v.(map[string]interface{})
 	buf.WriteString(fmt.Sprintf("%s-", m["event_type"].(string)))
-	buf.WriteString(fmt.Sprintf("%s", m["lambda_arn"].(string)))
+	buf.WriteString(m["lambda_arn"].(string))
 	buf.WriteString(fmt.Sprintf("%t", m["include_body"].(bool)))
 	return hashcode.String(buf.String())
 }
@@ -1259,7 +1259,7 @@ func simpleCopyStruct(src, dst interface{}) {
 	d := reflect.ValueOf(dst).Elem()
 
 	for i := 0; i < s.NumField(); i++ {
-		if s.Field(i).CanSet() == true {
+		if s.Field(i).CanSet() {
 			if s.Field(i).Interface() != nil {
 				for j := 0; j < d.NumField(); j++ {
 					if d.Type().Field(j).Name == s.Type().Field(i).Name {