Merge pull request #1785 from ekini/default_certificate

If default cloudfront certificate is used, ignore minimum_protocol_version
hashicorp · Oct 14, 2017 · a45d3a5 · a45d3a5
2 parents 6a94aee + 52ad2b6
commit a45d3a5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/aws/cloudfront_distribution_configuration_structure.go b/aws/cloudfront_distribution_configuration_structure.go
@@ -1096,8 +1096,12 @@ func viewerCertificateHash(v interface{}) int {
 	} else {
 		buf.WriteString(fmt.Sprintf("%t-", m["cloudfront_default_certificate"].(bool)))
 	}
-	if v, ok := m["minimum_protocol_version"]; ok && v.(string) != "" {
-		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
+	// if minimum_protocol_version is not specified and we use cloudfront_default_certificate,
+	// ignore current value of minimum_protocol_version
+	if c, ok := m["cloudfront_default_certificate"]; !(ok && c.(bool)) {
+		if v, ok := m["minimum_protocol_version"]; ok && v.(string) != "" {
+			buf.WriteString(fmt.Sprintf("%s-", v.(string)))
+		}
 	}
 	return hashcode.String(buf.String())
 }