Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Support enabling NAU metrics in "aws_vpc" resource #838

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3be42c2
adding variable enable_network_address_usage_metrics
Oct 11, 2022
b38e25d
remove dot from description
Oct 11, 2022
6bdb895
Merge branch 'master' into enable_nau_metrics
antonbabenko Oct 21, 2022
52c9fc8
Merge branch 'master' into enable_nau_metrics
antonbabenko Jan 3, 2023
5245e46
Merge branch 'master' into enable_nau_metrics
antonbabenko Jan 3, 2023
9864c19
Merge branch 'master' into enable_nau_metrics
bryantbiggs Feb 8, 2023
df791ab
feat: Update min required versions consistently, remove classiclink a…
bryantbiggs Feb 8, 2023
7830449
refactor: Update default settings for DNS hostnames and map public IP…
bryantbiggs Feb 8, 2023
e75d008
chore: Update outputs to use long form for list
bryantbiggs Feb 9, 2023
a8de9c5
feat: Update subnets to use latest available arguments
bryantbiggs Feb 10, 2023
e4d85ef
fix: Remove validation on flow log file format which is causing an error
bryantbiggs Feb 10, 2023
ae36e7f
chore: Clean up example name syntax
bryantbiggs Feb 10, 2023
5ac5842
feat: Add upgrade guide
bryantbiggs Feb 10, 2023
624b954
chore: Update examples to use AZ data source and cidrsubnet() function
bryantbiggs Feb 10, 2023
f23c52f
feat: Add IPv6 only example
bryantbiggs Feb 11, 2023
447a432
fix: RDS subnet groups are dualstack only
bryantbiggs Feb 11, 2023
a29763a
chore: Updates from testing
bryantbiggs Feb 11, 2023
65f1d29
chore: Updates from PR review feedback
bryantbiggs Feb 18, 2023
190f197
Merge branch 'master' of github.com:bryantbiggs/terraform-aws-vpc int…
bryantbiggs Apr 5, 2023
28fb8fa
chore: Update example to show default resources not being managed
bryantbiggs Apr 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,13 @@ Full contributing [guidelines are covered here](.github/contributing.md).
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.73 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.35 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.73 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.35 |

## Modules

Expand Down Expand Up @@ -426,6 +426,7 @@ No modules.
| <a name="input_enable_flow_log"></a> [enable\_flow\_log](#input\_enable\_flow\_log) | Whether or not to enable VPC Flow Logs | `bool` | `false` | no |
| <a name="input_enable_ipv6"></a> [enable\_ipv6](#input\_enable\_ipv6) | Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length for the VPC. You cannot specify the range of IP addresses, or the size of the CIDR block. | `bool` | `false` | no |
| <a name="input_enable_nat_gateway"></a> [enable\_nat\_gateway](#input\_enable\_nat\_gateway) | Should be true if you want to provision NAT Gateways for each of your private networks | `bool` | `false` | no |
| <a name="input_enable_network_address_usage_metrics"></a> [enable\_network\_address\_usage\_metrics](#input\_enable\_network\_address\_usage\_metrics) | Should be true to enable Network Adress Usage for the VPC | `bool` | `null` | no |
| <a name="input_enable_public_redshift"></a> [enable\_public\_redshift](#input\_enable\_public\_redshift) | Controls if redshift should have public routing table | `bool` | `false` | no |
| <a name="input_enable_vpn_gateway"></a> [enable\_vpn\_gateway](#input\_enable\_vpn\_gateway) | Should be true if you want to create a new VPN Gateway resource and attach it to the VPC | `bool` | `false` | no |
| <a name="input_external_nat_ip_ids"></a> [external\_nat\_ip\_ids](#input\_external\_nat\_ip\_ids) | List of EIP IDs to be assigned to the NAT Gateways (used in combination with reuse\_nat\_ips) | `list(string)` | `[]` | no |
Expand Down
11 changes: 6 additions & 5 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ resource "aws_vpc" "this" {
ipv6_ipam_pool_id = var.ipv6_ipam_pool_id
ipv6_netmask_length = var.ipv6_netmask_length

instance_tenancy = var.instance_tenancy
enable_dns_hostnames = var.enable_dns_hostnames
enable_dns_support = var.enable_dns_support
enable_classiclink = null # https://github.com/hashicorp/terraform/issues/31730
enable_classiclink_dns_support = null # https://github.com/hashicorp/terraform/issues/31730
instance_tenancy = var.instance_tenancy
enable_dns_hostnames = var.enable_dns_hostnames
enable_dns_support = var.enable_dns_support
enable_classiclink = null # https://github.com/hashicorp/terraform/issues/31730
enable_classiclink_dns_support = null # https://github.com/hashicorp/terraform/issues/31730
enable_network_address_usage_metrics = var.enable_network_address_usage_metrics

tags = merge(
{ "Name" = var.name },
Expand Down
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@ variable "enable_classiclink_dns_support" {
default = null
}

variable "enable_network_address_usage_metrics" {
description = "Should be true to enable Network Adress Usage for the VPC"
type = bool
default = null
}

variable "enable_nat_gateway" {
description = "Should be true if you want to provision NAT Gateways for each of your private networks"
type = bool
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.73"
version = ">= 4.35"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a breaking change

}
}
}