Merge pull request #14339 from terraform-providers/td-cloudfront-dist…

…ribution-flatmap

resource/cloudfront_distribution: re-introduce changes from #10013 to update active_trusted_signers attribute

aws/cloudfront_distribution_configuration_structure.go

@@ -17,7 +17,6 @@ import (
  "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
  "github.com/hashicorp/terraform-plugin-sdk/helper/resource"
  "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
- "github.com/terraform-providers/terraform-provider-aws/aws/internal/flatmap"
 )
 
 // cloudFrontRoute53ZoneID defines the route 53 zone ID for CloudFront. This
@@ -1097,20 +1096,30 @@ func flattenViewerCertificate(vc *cloudfront.ViewerCertificate) []interface{} {
  return []interface{}{m}
 }
 
-// Convert *cloudfront.ActiveTrustedSigners to a flatmap.Map type, which ensures
-// it can probably be inserted into the schema.TypeMap type used by the
-// active_trusted_signers attribute.
-func flattenActiveTrustedSigners(ats *cloudfront.ActiveTrustedSigners) flatmap.Map {
- m := make(map[string]interface{})
- s := []interface{}{}
- m["enabled"] = *ats.Enabled
+func flattenCloudfrontActiveTrustedSigners(ats *cloudfront.ActiveTrustedSigners) []interface{} {
+ if ats == nil {
+ return []interface{}{}
+ }
+
+ m := map[string]interface{}{
+ "enabled": aws.BoolValue(ats.Enabled),
+ "items": flattenCloudfrontSigners(ats.Items),
+ }
+
+ return []interface{}{m}
+}
 
- for _, v := range ats.Items {
- signer := make(map[string]interface{})
- signer["aws_account_number"] = *v.AwsAccountNumber
- signer["key_pair_ids"] = aws.StringValueSlice(v.KeyPairIds.Items)
- s = append(s, signer)
+func flattenCloudfrontSigners(signers []*cloudfront.Signer) []interface{} {
+ result := make([]interface{}, 0, len(signers))
+
+ for _, signer := range signers {
+ m := map[string]interface{}{
+ "aws_account_number": aws.StringValue(signer.AwsAccountNumber),
+ "key_pair_ids": aws.StringValueSlice(signer.KeyPairIds.Items),
+ }
+
+ result = append(result, m)
  }
- m["items"] = s
- return flatmap.Flatten(m)
+
+ return result
 }