From af5e78ef52c9e513fbe91b3a289863b22bbd3daf Mon Sep 17 00:00:00 2001 From: drewmullen Date: Tue, 7 Jun 2022 12:02:18 -0400 Subject: [PATCH] include older output names with deprecation notice --- README.md | 7 +++++-- outputs.tf | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 459d9a8..cf3c583 100644 --- a/README.md +++ b/README.md @@ -152,8 +152,8 @@ Please see our [developer documentation](https://github.com/aws-ia/terraform-aws | Name | Version | |------|---------| -| [aws](#provider\_aws) | 4.14.0 | -| [awscc](#provider\_awscc) | 0.21.0 | +| [aws](#provider\_aws) | >= 3.73.0 | +| [awscc](#provider\_awscc) | >= 0.15.0 | ## Modules @@ -214,10 +214,13 @@ Please see our [developer documentation](https://github.com/aws-ia/terraform-aws | Name | Description | |------|-------------| | [nat\_gateway\_attributes\_by\_az](#output\_nat\_gateway\_attributes\_by\_az) | Map of nat gateway resource attributes by AZ.

Example:
nat_gateway_attributes_by_az = {
  "us-east-1a" = {
    "allocation_id" = "eipalloc-0e8b20303eea88b13"
    "connectivity_type" = "public"
    "id" = "nat-0fde39f9550f4abb5"
    "network_interface_id" = "eni-0d422727088bf9a86"
    "private_ip" = "10.0.3.40"
    "public_ip" = <>
    "subnet_id" = "subnet-0f11c92e439c8ab4a"
    "tags" = tomap({
      "Name" = "nat-my-public-us-east-1a"
    })
    "tags_all" = tomap({
      "Name" = "nat-my-public-us-east-1a"
    })
  }
  "us-east-1b" = { ... }
}
| +| [nat\_gateways\_by\_az](#output\_nat\_gateways\_by\_az) | DEPRECATED OUTPUT: this output has been renamed to `nat_gateway_attributes_by_az`. Please transition to that output and see it for a proper description. | | [private\_subnet\_attributes\_by\_az](#output\_private\_subnet\_attributes\_by\_az) | Map of all private subnets containing their attributes.

Example:
private_subnet_attributes = {
  "us-east-1a" = {
    "arn" = "arn:aws:ec2:us-east-1:<>:subnet/subnet-04a86315c4839b519"
    "assign_ipv6_address_on_creation" = false
    ...
    
  }
  "us-east-1b" = {...)
}
| | [public\_subnet\_attributes\_by\_az](#output\_public\_subnet\_attributes\_by\_az) | Map of all public subnets containing their attributes.

Example:
public_subnet_attributes = {
  "us-east-1a" = {
    "arn" = "arn:aws:ec2:us-east-1:<>:subnet/subnet-04a86315c4839b519"
    "assign_ipv6_address_on_creation" = false
    ...
    
  }
  "us-east-1b" = {...)
}
| | [route\_table\_attributes\_by\_type\_by\_az](#output\_route\_table\_attributes\_by\_type\_by\_az) | Map of route tables by type => az => route table attributes. Example usage: module.vpc.route\_table\_by\_subnet\_type.private.id

Example:
route_table_attributes_by_type_by_az = {
  "private" = {
    "us-east-1a" = {
      "id" = "rtb-0e77040c0598df003"
      "route_table_id" = "rtb-0e77040c0598df003"
      "tags" = tolist([
        {
          "key" = "Name"
          "value" = "private-us-east-1a"
        },
      ])
      "vpc_id" = "vpc-033e054f49409592a"
    }
    "us-east-1b" = { ... }
  "public" = { ... }
| +| [route\_table\_by\_subnet\_type](#output\_route\_table\_by\_subnet\_type) | DEPRECATED OUTPUT: this output has been renamed to `route_table_attributes_by_type_by_az`. Please transition to that output and see it for a proper description. | | [subnet\_cidrs\_by\_type\_by\_az](#output\_subnet\_cidrs\_by\_type\_by\_az) | Map of subnets grouped by type with child map { az = cidr }.

Example:
subnets = {
    private = {
      us-east-1a = "10.0.0.0/24"
      us-east-1b = "10.0.1.0/24"
      us-east-1c = "10.0.2.0/24"
    }
    public  = {
      us-east-1a = "10.0.3.0/24"
      us-east-1b = "10.0.4.0/24"
      us-east-1c = "10.0.5.0/24"
    }
  }
| +| [subnets](#output\_subnets) | DEPRECATED OUTPUT: this output has been renamed to `subnet_cidrs_by_type_by_az`. Please transition to that output and see it for a proper description. | | [tgw\_subnet\_attributes\_by\_az](#output\_tgw\_subnet\_attributes\_by\_az) | Map of all tgw subnets containing their attributes.

Example:
tgw_subnet_attributes = {
  "us-east-1a" = {
    "arn" = "arn:aws:ec2:us-east-1:<>:subnet/subnet-04a86315c4839b519"
    "assign_ipv6_address_on_creation" = false
    ...
    
  }
  "us-east-1b" = {...)
}
| | [transit\_gateway\_attachment\_id](#output\_transit\_gateway\_attachment\_id) | Transit gateway attachment id. | | [vpc\_attributes](#output\_vpc\_attributes) | VPC resource attributes. Full output of aws\_vpc. | diff --git a/outputs.tf b/outputs.tf index 0cb08a7..7937028 100644 --- a/outputs.tf +++ b/outputs.tf @@ -151,3 +151,24 @@ output "nat_gateway_attributes_by_az" { EOF } +## DEPRECATED OUTPUTS + +output "subnets" { + description = "DEPRECATED OUTPUT: this output has been renamed to `subnet_cidrs_by_type_by_az`. Please transition to that output and see it for a proper description." + value = module.calculate_subnets.subnets_by_type +} + +output "route_table_by_subnet_type" { + description = "DEPRECATED OUTPUT: this output has been renamed to `route_table_attributes_by_type_by_az`. Please transition to that output and see it for a proper description." + value = { + # TODO: omit keys if value is null + "private" = awscc_ec2_route_table.private, + "public" = awscc_ec2_route_table.public + "transit_gateway" = awscc_ec2_route_table.tgw + } +} + +output "nat_gateways_by_az" { + description = "DEPRECATED OUTPUT: this output has been renamed to `nat_gateway_attributes_by_az`. Please transition to that output and see it for a proper description." + value = try(aws_nat_gateway.main, null) +}