merge conflicts

magreenbaum · magreenbaum · commit 33e4bbd1b778 · 2025-07-19T00:56:51.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.96.1
+    rev: v1.99.4
     hooks:
       - id: terraform_fmt
       - id: terraform_wrapper_module_for_each
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.0.0](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v5.2.0...v6.0.0) (2025-06-23)
+
+
+### ⚠ BREAKING CHANGES
+
+* Handle new region parameter introduced in terraform-aws 6.0 (#156)
+
+### Features
+
+* Handle new region parameter introduced in terraform-aws 6.0 ([#156](https://github.com/terraform-aws-modules/terraform-aws-acm/issues/156)) ([e503ecd](https://github.com/terraform-aws-modules/terraform-aws-acm/commit/e503ecd3925729b0291f7052416f053a952bb0a9))
+
+## [5.2.0](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v5.1.1...v5.2.0) (2025-06-05)
+
+
+### Features
+
+* Add support for private CA certificates ([#155](https://github.com/terraform-aws-modules/terraform-aws-acm/issues/155)) ([f5dffc6](https://github.com/terraform-aws-modules/terraform-aws-acm/commit/f5dffc6bb65f783661685585cc6d0b9799a8c7c1))
+
 ## [5.1.1](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v5.1.0...v5.1.1) (2024-10-11)
 
 
diff --git a/README.md b/README.md
@@ -179,7 +179,7 @@ module "acm" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
 
 ## Providers
@@ -214,8 +214,9 @@ No modules.
 | <a name="input_domain_name"></a> [domain\_name](#input\_domain\_name) | A domain name for which the certificate should be issued | `string` | `""` | no |
 | <a name="input_export"></a> [export](#input\_export) | Whether the certificate can be exported. Valid values are ENABLED or DISABLED (default). Note Issuing an exportable certificate is subject to additional charges | `string` | `null` | no |
 | <a name="input_key_algorithm"></a> [key\_algorithm](#input\_key\_algorithm) | Specifies the algorithm of the public and private key pair that your Amazon issued certificate uses to encrypt data | `string` | `null` | no |
+| <a name="input_private_authority_arn"></a> [private\_authority\_arn](#input\_private\_authority\_arn) | Private Certificate Authority ARN for issuing private certificates | `string` | `null` | no |
 | <a name="input_putin_khuylo"></a> [putin\_khuylo](#input\_putin\_khuylo) | Do you agree that Putin doesn't respect Ukrainian sovereignty and territorial integrity? More info: https://en.wikipedia.org/wiki/Putin_khuylo! | `bool` | `true` | no |
-| <a name="input_region"></a> [region](#input\_region) | Region where this resource will be managed. Defaults to the Region set in the provider configuration | `string` | `null` | no |
+| <a name="input_region"></a> [region](#input\_region) | Region to create the resources into | `string` | `null` | no |
 | <a name="input_subject_alternative_names"></a> [subject\_alternative\_names](#input\_subject\_alternative\_names) | A list of domains that should be SANs in the issued certificate | `list(string)` | `[]` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | A mapping of tags to assign to the resource | `map(string)` | `{}` | no |
 | <a name="input_validate_certificate"></a> [validate\_certificate](#input\_validate\_certificate) | Whether to validate certificate by creating Route53 record | `bool` | `true` | no |
diff --git a/examples/complete-dns-validation-with-cloudflare/README.md b/examples/complete-dns-validation-with-cloudflare/README.md
@@ -23,7 +23,7 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
 | <a name="requirement_cloudflare"></a> [cloudflare](#requirement\_cloudflare) | >= 3.4, <=3.32 |
 
diff --git a/examples/complete-dns-validation-with-cloudflare/main.tf b/examples/complete-dns-validation-with-cloudflare/main.tf
@@ -5,6 +5,14 @@ locals {
   domain_name = trimsuffix(local.domain, ".")
 }
 
+provider "aws" {
+  alias = "route53"
+}
+
+provider "aws" {
+  alias = "acm"
+}
+
 module "acm" {
   source = "../../"
 
diff --git a/examples/complete-dns-validation-with-cloudflare/versions.tf b/examples/complete-dns-validation-with-cloudflare/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
diff --git a/examples/complete-dns-validation/README.md b/examples/complete-dns-validation/README.md
@@ -23,7 +23,7 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
 
 ## Providers
diff --git a/examples/complete-dns-validation/versions.tf b/examples/complete-dns-validation/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
diff --git a/examples/complete-email-validation-with-validation-domain/README.md b/examples/complete-email-validation-with-validation-domain/README.md
@@ -32,7 +32,7 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
 
 ## Providers
diff --git a/examples/complete-email-validation-with-validation-domain/versions.tf b/examples/complete-email-validation-with-validation-domain/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
diff --git a/examples/complete-email-validation/README.md b/examples/complete-email-validation/README.md
@@ -36,7 +36,7 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
 
 ## Providers
diff --git a/examples/complete-email-validation/versions.tf b/examples/complete-email-validation/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
diff --git a/main.tf b/main.tf
@@ -25,6 +25,8 @@ resource "aws_acm_certificate" "this" {
   key_algorithm             = var.key_algorithm
   region                    = var.region
 
+  certificate_authority_arn = var.private_authority_arn
+
   options {
     certificate_transparency_logging_preference = var.certificate_transparency_logging_preference ? "ENABLED" : "DISABLED"
     export                                      = var.export
@@ -67,11 +69,10 @@ resource "aws_acm_certificate_validation" "this" {
   count = local.create_certificate && var.validation_method != null && var.validate_certificate && var.wait_for_validation ? 1 : 0
 
   certificate_arn = aws_acm_certificate.this[0].arn
+  region          = var.region
 
   validation_record_fqdns = flatten([aws_route53_record.validation[*].fqdn, var.validation_record_fqdns])
 
-  region = var.region
-
   timeouts {
     create = var.validation_timeout
   }
diff --git a/variables.tf b/variables.tf
@@ -46,6 +46,12 @@ variable "domain_name" {
   default     = ""
 }
 
+variable "region" {
+  description = "Region to create the resources into"
+  type        = string
+  default     = null
+}
+
 variable "subject_alternative_names" {
   description = "A list of domains that should be SANs in the issued certificate"
   type        = list(string)
@@ -129,8 +135,8 @@ variable "export" {
   default     = null
 }
 
-variable "region" {
-  description = "Region where this resource will be managed. Defaults to the Region set in the provider configuration"
+variable "private_authority_arn" {
+  description = "Private Certificate Authority ARN for issuing private certificates"
   type        = string
   default     = null
 }
diff --git a/versions.tf b/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
diff --git a/wrappers/main.tf b/wrappers/main.tf
@@ -13,6 +13,7 @@ module "wrapper" {
   domain_name                                 = try(each.value.domain_name, var.defaults.domain_name, "")
   export                                      = try(each.value.export, var.defaults.export, null)
   key_algorithm                               = try(each.value.key_algorithm, var.defaults.key_algorithm, null)
+  private_authority_arn                       = try(each.value.private_authority_arn, var.defaults.private_authority_arn, null)
   putin_khuylo                                = try(each.value.putin_khuylo, var.defaults.putin_khuylo, true)
   region                                      = try(each.value.region, var.defaults.region, null)
   subject_alternative_names                   = try(each.value.subject_alternative_names, var.defaults.subject_alternative_names, [])
diff --git a/wrappers/versions.tf b/wrappers/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.7"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
