Skip to content

Commit 464291c

Browse files
committed
refactor(modules/acm): remove configuration for private ca issued certificates
1 parent 3de628f commit 464291c

File tree

8 files changed

+2
-80
lines changed

8 files changed

+2
-80
lines changed

README.md

-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Terraform module to deploy production-ready applications and services on an exis
3737
|------|-------------|------|---------|:--------:|
3838
| <a name="input_acm_amazon_issued_certificates"></a> [acm\_amazon\_issued\_certificates](#input\_acm\_amazon\_issued\_certificates) | Amazon-issued ACM certificates to create | `any` | `{}` | no |
3939
| <a name="input_acm_imported_certificates"></a> [acm\_imported\_certificates](#input\_acm\_imported\_certificates) | Imported ACM certificates to create | `any` | `{}` | no |
40-
| <a name="input_acm_private_ca_issued_certificates"></a> [acm\_private\_ca\_issued\_certificates](#input\_acm\_private\_ca\_issued\_certificates) | Private CA Issued ACM certificates to create | `any` | `{}` | no |
4140
| <a name="input_capacity_provider_default_auto_scaling_group_arn"></a> [capacity\_provider\_default\_auto\_scaling\_group\_arn](#input\_capacity\_provider\_default\_auto\_scaling\_group\_arn) | Default Autoscaling Group to use with the Capacity Providers | `string` | `null` | no |
4241
| <a name="input_capacity_providers"></a> [capacity\_providers](#input\_capacity\_providers) | Capacity Providers to create for use within the ECS Cluster | `any` | `{}` | no |
4342
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of the ECS Cluster to use with the ECS Service | `string` | n/a | yes |
@@ -70,6 +69,4 @@ Terraform module to deploy production-ready applications and services on an exis
7069
| <a name="output_ecs_service_arn"></a> [ecs\_service\_arn](#output\_ecs\_service\_arn) | ARN of the ECS Service |
7170
| <a name="output_ecs_task_definition_arn"></a> [ecs\_task\_definition\_arn](#output\_ecs\_task\_definition\_arn) | ARN of the ECS Task Definition |
7271
| <a name="output_imported_acm_certificates_arns"></a> [imported\_acm\_certificates\_arns](#output\_imported\_acm\_certificates\_arns) | ARNs of the Imported ACM certificates |
73-
| <a name="output_private_ca_issued_acm_certificates_arns"></a> [private\_ca\_issued\_acm\_certificates\_arns](#output\_private\_ca\_issued\_acm\_certificates\_arns) | ARNs of the Private CA issued ACM certificates |
74-
| <a name="output_private_ca_issued_acm_certificates_validation_records"></a> [private\_ca\_issued\_acm\_certificates\_validation\_records](#output\_private\_ca\_issued\_acm\_certificates\_validation\_records) | Validation Records of the Private CA issued ACM certificates |
7572
<!-- END_TF_DOCS -->

main.tf

+2-3
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ module "acm" {
336336

337337
count = var.create_acm ? 1 : 0
338338

339-
amazon_issued_certificates = try(var.acm_amazon_issued_certificates, {})
340-
imported_certificates = try(var.acm_imported_certificates, {})
341-
private_ca_issued_certificates = try(var.acm_private_ca_issued_certificates, {})
339+
amazon_issued_certificates = try(var.acm_amazon_issued_certificates, {})
340+
imported_certificates = try(var.acm_imported_certificates, {})
342341
}

modules/acm/README.md

-4
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ No modules.
2323
|------|------|
2424
| [aws_acm_certificate.amazon_issued](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate) | resource |
2525
| [aws_acm_certificate.imported](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate) | resource |
26-
| [aws_acm_certificate.private_ca_issued](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate) | resource |
2726

2827
## Inputs
2928

3029
| Name | Description | Type | Default | Required |
3130
|------|-------------|------|---------|:--------:|
3231
| <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(any), {})<br> }))</pre> | `{}` | no |
3332
| <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(any), {})<br> }))</pre> | `{}` | no |
34-
| <a name="input_private_ca_issued_certificates"></a> [private\_ca\_issued\_certificates](#input\_private\_ca\_issued\_certificates) | List of Private CA issued certificates to use to create ACM certificates | <pre>map(object({<br> certificate_authority_arn = string<br> domain_name = string<br> early_renewal_duration = optional(string, null)<br> tags = optional(map(any), {})<br> }))</pre> | `{}` | no |
3533
| <a name="input_tags"></a> [tags](#input\_tags) | Resource Tags to use with the created ACM certificates | `map(any)` | `{}` | no |
3634

3735
## Outputs
@@ -41,6 +39,4 @@ No modules.
4139
| <a name="output_amazon_issued_acm_certificates_arns"></a> [amazon\_issued\_acm\_certificates\_arns](#output\_amazon\_issued\_acm\_certificates\_arns) | ARNs of the Amazon issued ACM certificates |
4240
| <a name="output_amazon_issued_acm_certificates_validation_records"></a> [amazon\_issued\_acm\_certificates\_validation\_records](#output\_amazon\_issued\_acm\_certificates\_validation\_records) | Validation Records of the Amazon issued ACM certificates |
4341
| <a name="output_imported_acm_certificates_arns"></a> [imported\_acm\_certificates\_arns](#output\_imported\_acm\_certificates\_arns) | ARNs of the Imported ACM certificates |
44-
| <a name="output_private_ca_issued_acm_certificates_arns"></a> [private\_ca\_issued\_acm\_certificates\_arns](#output\_private\_ca\_issued\_acm\_certificates\_arns) | ARNs of the Private CA issued ACM certificates |
45-
| <a name="output_private_ca_issued_acm_certificates_validation_records"></a> [private\_ca\_issued\_acm\_certificates\_validation\_records](#output\_private\_ca\_issued\_acm\_certificates\_validation\_records) | Validation Records of the Private CA issued ACM certificates |
4642
<!-- END_TF_DOCS -->

modules/acm/main.tf

-18
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,3 @@ resource "aws_acm_certificate" "imported" {
5151

5252
tags = merge(var.tags, each.value.tags)
5353
}
54-
55-
################################################################################
56-
# ACM Private CA issued certificates
57-
################################################################################
58-
59-
resource "aws_acm_certificate" "private_ca_issued" {
60-
for_each = var.private_ca_issued_certificates
61-
62-
certificate_authority_arn = each.value.certificate_authority_arn
63-
domain_name = each.value.domain_name
64-
early_renewal_duration = each.value.early_renewal_duration
65-
66-
lifecycle {
67-
create_before_destroy = true
68-
}
69-
70-
tags = merge(var.tags, each.value.tags)
71-
}

modules/acm/outputs.tf

-25
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,3 @@ output "imported_acm_certificates_arns" {
3131
description = "ARNs of the Imported ACM certificates"
3232
value = { for k, v in aws_acm_certificate.imported : k => v.arn }
3333
}
34-
35-
################################################################################
36-
# ACM Private CA issued certificates
37-
################################################################################
38-
39-
output "private_ca_issued_acm_certificates_arns" {
40-
description = "ARNs of the Private CA issued ACM certificates"
41-
value = { for k, v in aws_acm_certificate.private_ca_issued : k => v.arn }
42-
}
43-
44-
output "private_ca_issued_acm_certificates_validation_records" {
45-
description = "Validation Records of the Private CA issued ACM certificates"
46-
value = {
47-
for k, v in aws_acm_certificate.private_ca_issued :
48-
k => [
49-
for record in v.domain_validation_options :
50-
{
51-
name = record.resource_record_name
52-
type = record.resource_record_type
53-
value = record.resource_record_value
54-
domain = record.domain_name
55-
}
56-
]
57-
}
58-
}

modules/acm/variables.tf

-11
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ variable "imported_certificates" {
3232
default = {}
3333
}
3434

35-
variable "private_ca_issued_certificates" {
36-
description = "List of Private CA issued certificates to use to create ACM certificates"
37-
type = map(object({
38-
certificate_authority_arn = string
39-
domain_name = string
40-
early_renewal_duration = optional(string, null)
41-
tags = optional(map(any), {})
42-
}))
43-
default = {}
44-
}
45-
4635
variable "tags" {
4736
description = "Resource Tags to use with the created ACM certificates"
4837
type = map(any)

outputs.tf

-10
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@ output "imported_acm_certificates_arns" {
3535
value = try(module.acm[0].imported_acm_certificates_arns, null)
3636
}
3737

38-
output "private_ca_issued_acm_certificates_arns" {
39-
description = "ARNs of the Private CA issued ACM certificates"
40-
value = try(module.acm[0].private_ca_issued_acm_certificates_arns, null)
41-
}
42-
43-
output "private_ca_issued_acm_certificates_validation_records" {
44-
description = "Validation Records of the Private CA issued ACM certificates"
45-
value = try(module.acm[0].private_ca_issued_acm_certificates_validation_records, null)
46-
}
47-
4838
################################################################################
4939
# Application Load Balancer
5040
################################################################################

variables.tf

-6
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,3 @@ variable "acm_imported_certificates" {
9191
type = any
9292
default = {}
9393
}
94-
95-
variable "acm_private_ca_issued_certificates" {
96-
description = "Private CA Issued ACM certificates to create"
97-
type = any
98-
default = {}
99-
}

0 commit comments

Comments
 (0)