Merge pull request #63 from mdr-engineering/feature/ftd_na_tf13_upgrade_2

Fixes Minor Issues with TF12

base/customer_portal/main.tf

@@ -8,14 +8,24 @@ resource "aws_acm_certificate" "portal_cert" {
 
 resource "aws_acm_certificate_validation" "portal_cert" {
   certificate_arn         = aws_acm_certificate.portal_cert.arn
-  validation_record_fqdns = [aws_route53_record.portal_cert_validation.fqdn]
+  validation_record_fqdns = [for record in aws_route53_record.portal_cert_validation: record.fqdn]
 }
 
 resource "aws_route53_record" "portal_cert_validation" {
   provider = aws.mdr-common-services-commercial
-  name     = aws_acm_certificate.portal_cert.domain_validation_options.0.resource_record_name
-  type     = aws_acm_certificate.portal_cert.domain_validation_options.0.resource_record_type
-  zone_id  = var.dns_info["public"]["zone_id"]
-  records  = [aws_acm_certificate.portal_cert.domain_validation_options.0.resource_record_value]
-  ttl      = 60
+
+  for_each = {
+    for dvo in aws_acm_certificate.portal_cert.domain_validation_options : dvo.domain_name => {
+      name   = dvo.resource_record_name
+      record = dvo.resource_record_value
+      type   = dvo.resource_record_type
+    }
+  }
+
+  allow_overwrite = true
+  name            = each.value.name
+  records         = [each.value.record]
+  ttl             = 60
+  type            = each.value.type
+  zone_id         = var.dns_info["public"]["zone_id"]
 }

submodules/iam/common_services_roles/modules/saml_linked_role/versions.tf

@@ -0,0 +1,11 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+    okta = {
+      source = "oktadeveloper/okta"
+    }
+  }
+  required_version = ">= 0.13"
+}

submodules/iam/common_services_roles/versions.tf

@@ -1,3 +1,11 @@
 terraform {
-  required_version = "~> 0.13"
+  required_version = ">= 0.13"
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+    okta = {
+      source = "oktadeveloper/okta"
+    }
+  }
 }