Skip to content

Commit 504c5b1

Browse files
committed
refactor(modules/acm): remove unnecessary configuration
BREAKING CHANGE: This commit removes support for certain configuration.
1 parent 0c5f7b3 commit 504c5b1

File tree

4 files changed

+1
-21
lines changed

4 files changed

+1
-21
lines changed

modules/acm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ No modules.
2828

2929
| Name | Description | Type | Default | Required |
3030
|------|-------------|------|---------|:--------:|
31-
| <a name="input_amazon_issued_certificates"></a> [amazon\_issued\_certificates](#input\_amazon\_issued\_certificates) | List of Amazon-issued certificates to ACM create. | <pre>map(object({<br> domain_name = string<br> subject_alternative_names = optional(list(string), [])<br> validation_method = optional(string, null)<br> key_algorithm = optional(string, null)<br> options = optional(object({<br> certificate_transparency_logging_preference = optional(string, null)<br> }))<br> validation_option = optional(object({<br> domain_name = string<br> validation_domain = string<br> }))<br> tags = optional(map(string), {})<br> }))</pre> | `{}` | no |
31+
| <a name="input_amazon_issued_certificates"></a> [amazon\_issued\_certificates](#input\_amazon\_issued\_certificates) | List of Amazon-issued certificates to ACM create. | <pre>map(object({<br> domain_name = string<br> subject_alternative_names = optional(list(string), [])<br> validation_method = optional(string, null)<br> key_algorithm = optional(string, null)<br> validation_option = optional(object({<br> domain_name = string<br> validation_domain = string<br> }))<br> tags = optional(map(string), {})<br> }))</pre> | `{}` | no |
3232
| <a name="input_imported_certificates"></a> [imported\_certificates](#input\_imported\_certificates) | List of imported certificates to use to create ACM certificates. | <pre>map(object({<br> private_key = string<br> certificate_body = string<br> certificate_chain = optional(string, null)<br> tags = optional(map(string), {})<br> }))</pre> | `{}` | no |
3333
| <a name="input_tags"></a> [tags](#input\_tags) | (Optional) Map of tags to assign to the resource. | `map(string)` | `{}` | no |
3434

modules/acm/main.tf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ resource "aws_acm_certificate" "amazon_issued" {
1010
validation_method = each.value.validation_method
1111
key_algorithm = each.value.key_algorithm
1212

13-
dynamic "options" {
14-
for_each = try(each.value.options, null) != null ? [1] : []
15-
16-
content {
17-
certificate_transparency_logging_preference = each.value.options.certificate_transparency_logging_preference
18-
}
19-
}
20-
2113
dynamic "validation_option" {
2214
for_each = try(each.value.validation_option, null) != null ? [1] : []
2315

modules/acm/variables.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ variable "amazon_issued_certificates" {
99
subject_alternative_names = optional(list(string), [])
1010
validation_method = optional(string, null)
1111
key_algorithm = optional(string, null)
12-
options = optional(object({
13-
certificate_transparency_logging_preference = optional(string, null)
14-
}))
1512
validation_option = optional(object({
1613
domain_name = string
1714
validation_domain = string

tests/acm_unit_tests.tftest.hcl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ run "amazon_issued_certificates_attributes_match" {
2121
validation_method = "EMAIL"
2222
key_algorithm = "RSA_4096"
2323

24-
options = {
25-
certificate_transparency_logging_preference = "ENABLED"
26-
}
27-
2824
validation_option = {
2925
domain_name = "example.domain"
3026
validation_domain = "me@example.domain"
@@ -52,11 +48,6 @@ run "amazon_issued_certificates_attributes_match" {
5248
error_message = "Key algorithm mismatch"
5349
}
5450

55-
assert {
56-
condition = aws_acm_certificate.amazon_issued["example"].options[0].certificate_transparency_logging_preference == var.amazon_issued_certificates.example.options.certificate_transparency_logging_preference
57-
error_message = "Certificate transparency logging preference mismatch"
58-
}
59-
6051
assert {
6152
condition = tolist(aws_acm_certificate.amazon_issued["example"].validation_option)[0].domain_name == var.amazon_issued_certificates.example.validation_option.domain_name
6253
error_message = "Validation option domain name mismatch"

0 commit comments

Comments
 (0)