Merge branch 'master' into mbarrien/ecs-placement

Author: mbarrien

aws-acm-cert/README.md

@@ -41,6 +41,7 @@ module "cert" {
 | owner | Owner for tagging and naming. See [doc](../README.md#consistent-tagging). | string | n/a | yes |
 | project | Project for tagging and naming. See [doc](../README.md#consistent-tagging) | string | n/a | yes |
 | service | Service for tagging and naming. See [doc](../README.md#consistent-tagging). | string | n/a | yes |
+| subject\_alternative\_names\_order | Order to list the subject alternative names in the ACM cert. Workaround for https://github.com/terraform-providers/terraform-provider-aws/issues/8531 | list(string) | `null` | no |
 | validation\_record\_ttl |  | string | `"60"` | no |
 
 ## Outputs

aws-acm-cert/main.tf

@@ -12,7 +12,7 @@ locals {
 
 resource "aws_acm_certificate" "cert" {
   domain_name               = "${var.cert_domain_name}"
-  subject_alternative_names = "${keys(var.cert_subject_alternative_names)}"
+  subject_alternative_names = var.subject_alternative_names_order == null ? keys(var.cert_subject_alternative_names) : var.subject_alternative_names_order
   validation_method         = "DNS"
   tags                      = "${local.tags}"
 

aws-acm-cert/variables.tf

@@ -43,3 +43,9 @@ variable "allow_validation_record_overwrite" {
   description = "Allow the overwrite of validation records. This is needed if you are creating certificates in multiple regions."
   default     = true
 }
+
+variable "subject_alternative_names_order" {
+  type        = list(string)
+  description = "Order to list the subject alternative names in the ACM cert. Workaround for https://github.com/terraform-providers/terraform-provider-aws/issues/8531"
+  default     = null
+}