Merge branch 'master' into master

brylex418 · web-flow · commit 39a46af6c866 · 2021-01-15T21:23:15.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 
 
 
+<a name="v2.66.0"></a>
+## [v2.66.0] - 2021-01-14
+
+- docs: Clarifies default_vpc attributes ([#552](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/552))
+
+
 <a name="v2.65.0"></a>
 ## [v2.65.0] - 2021-01-14
 
@@ -988,13 +994,13 @@ All notable changes to this project will be documented in this file.
 - Reverted bad merge, fixed [#33](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/33)
 
 
-<a name="v1.5.1"></a>
-## [v1.5.1] - 2017-11-23
+<a name="v1.5.0"></a>
+## [v1.5.0] - 2017-11-23
 
 
 
-<a name="v1.5.0"></a>
-## [v1.5.0] - 2017-11-23
+<a name="v1.5.1"></a>
+## [v1.5.1] - 2017-11-23
 
 - Reverted bad merge, fixed [#33](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/33)
 - Set enable_dns_support=true by default
@@ -1067,7 +1073,8 @@ All notable changes to this project will be documented in this file.
 - Initial commit
 
 
-[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.65.0...HEAD
+[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.66.0...HEAD
+[v2.66.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.65.0...v2.66.0
 [v2.65.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.64.0...v2.65.0
 [v2.64.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.63.0...v2.64.0
 [v2.63.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.62.0...v2.63.0
@@ -1205,9 +1212,9 @@ All notable changes to this project will be documented in this file.
 [v1.8.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.6.0...v1.7.0
 [v1.6.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.1...v1.6.0
-[v1.4.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.1...v1.4.1
-[v1.5.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.0...v1.5.1
-[v1.5.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.0...v1.5.0
+[v1.4.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.0...v1.4.1
+[v1.5.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.1...v1.5.0
+[v1.5.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.0...v1.5.1
 [v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.3.0...v1.4.0
 [v1.3.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.1.0...v1.2.0
diff --git a/README.md b/README.md
@@ -673,16 +673,16 @@ It is possible to integrate this VPC module with [terraform-aws-transit-gateway
 | default\_network\_acl\_id | The ID of the default network ACL |
 | default\_route\_table\_id | The ID of the default route table |
 | default\_security\_group\_id | The ID of the security group created by default on VPC creation |
-| default\_vpc\_arn | The ARN of the VPC |
-| default\_vpc\_cidr\_block | The CIDR block of the VPC |
-| default\_vpc\_default\_network\_acl\_id | The ID of the default network ACL |
-| default\_vpc\_default\_route\_table\_id | The ID of the default route table |
-| default\_vpc\_default\_security\_group\_id | The ID of the security group created by default on VPC creation |
-| default\_vpc\_enable\_dns\_hostnames | Whether or not the VPC has DNS hostname support |
-| default\_vpc\_enable\_dns\_support | Whether or not the VPC has DNS support |
-| default\_vpc\_id | The ID of the VPC |
-| default\_vpc\_instance\_tenancy | Tenancy of instances spin up within VPC |
-| default\_vpc\_main\_route\_table\_id | The ID of the main route table associated with this VPC |
+| default\_vpc\_arn | The ARN of the Default VPC |
+| default\_vpc\_cidr\_block | The CIDR block of the Default VPC |
+| default\_vpc\_default\_network\_acl\_id | The ID of the default network ACL of the Default VPC |
+| default\_vpc\_default\_route\_table\_id | The ID of the default route table of the Default VPC |
+| default\_vpc\_default\_security\_group\_id | The ID of the security group created by default on Default VPC creation |
+| default\_vpc\_enable\_dns\_hostnames | Whether or not the Default VPC has DNS hostname support |
+| default\_vpc\_enable\_dns\_support | Whether or not the Default VPC has DNS support |
+| default\_vpc\_id | The ID of the Default VPC |
+| default\_vpc\_instance\_tenancy | Tenancy of instances spin up within Default VPC |
+| default\_vpc\_main\_route\_table\_id | The ID of the main route table associated with the Default VPC |
 | egress\_only\_internet\_gateway\_id | The ID of the egress only Internet Gateway |
 | elasticache\_network\_acl\_arn | ARN of the elasticache network ACL |
 | elasticache\_network\_acl\_id | ID of the elasticache network ACL |
diff --git a/outputs.tf b/outputs.tf
@@ -373,52 +373,52 @@ output "vgw_arn" {
 }
 
 output "default_vpc_id" {
-  description = "The ID of the VPC"
+  description = "The ID of the Default VPC"
   value       = concat(aws_default_vpc.this.*.id, [""])[0]
 }
 
 output "default_vpc_arn" {
-  description = "The ARN of the VPC"
+  description = "The ARN of the Default VPC"
   value       = concat(aws_default_vpc.this.*.arn, [""])[0]
 }
 
 output "default_vpc_cidr_block" {
-  description = "The CIDR block of the VPC"
+  description = "The CIDR block of the Default VPC"
   value       = concat(aws_default_vpc.this.*.cidr_block, [""])[0]
 }
 
 output "default_vpc_default_security_group_id" {
-  description = "The ID of the security group created by default on VPC creation"
+  description = "The ID of the security group created by default on Default VPC creation"
   value       = concat(aws_default_vpc.this.*.default_security_group_id, [""])[0]
 }
 
 output "default_vpc_default_network_acl_id" {
-  description = "The ID of the default network ACL"
+  description = "The ID of the default network ACL of the Default VPC"
   value       = concat(aws_default_vpc.this.*.default_network_acl_id, [""])[0]
 }
 
 output "default_vpc_default_route_table_id" {
-  description = "The ID of the default route table"
+  description = "The ID of the default route table of the Default VPC"
   value       = concat(aws_default_vpc.this.*.default_route_table_id, [""])[0]
 }
 
 output "default_vpc_instance_tenancy" {
-  description = "Tenancy of instances spin up within VPC"
+  description = "Tenancy of instances spin up within Default VPC"
   value       = concat(aws_default_vpc.this.*.instance_tenancy, [""])[0]
 }
 
 output "default_vpc_enable_dns_support" {
-  description = "Whether or not the VPC has DNS support"
+  description = "Whether or not the Default VPC has DNS support"
   value       = concat(aws_default_vpc.this.*.enable_dns_support, [""])[0]
 }
 
 output "default_vpc_enable_dns_hostnames" {
-  description = "Whether or not the VPC has DNS hostname support"
+  description = "Whether or not the Default VPC has DNS hostname support"
   value       = concat(aws_default_vpc.this.*.enable_dns_hostnames, [""])[0]
 }
 
 output "default_vpc_main_route_table_id" {
-  description = "The ID of the main route table associated with this VPC"
+  description = "The ID of the main route table associated with the Default VPC"
   value       = concat(aws_default_vpc.this.*.main_route_table_id, [""])[0]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -373,52 +373,52 @@ output "vgw_arn" {`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`output "default_vpc_id" {`
`376`		`- description = "The ID of the VPC"`
	`376`	`+ description = "The ID of the Default VPC"`
`377`	`377`	`value = concat(aws_default_vpc.this.*.id, [""])[0]`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`output "default_vpc_arn" {`
`381`		`- description = "The ARN of the VPC"`
	`381`	`+ description = "The ARN of the Default VPC"`
`382`	`382`	`value = concat(aws_default_vpc.this.*.arn, [""])[0]`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`output "default_vpc_cidr_block" {`
`386`		`- description = "The CIDR block of the VPC"`
	`386`	`+ description = "The CIDR block of the Default VPC"`
`387`	`387`	`value = concat(aws_default_vpc.this.*.cidr_block, [""])[0]`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`output "default_vpc_default_security_group_id" {`
`391`		`- description = "The ID of the security group created by default on VPC creation"`
	`391`	`+ description = "The ID of the security group created by default on Default VPC creation"`
`392`	`392`	`value = concat(aws_default_vpc.this.*.default_security_group_id, [""])[0]`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`output "default_vpc_default_network_acl_id" {`
`396`		`- description = "The ID of the default network ACL"`
	`396`	`+ description = "The ID of the default network ACL of the Default VPC"`
`397`	`397`	`value = concat(aws_default_vpc.this.*.default_network_acl_id, [""])[0]`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`output "default_vpc_default_route_table_id" {`
`401`		`- description = "The ID of the default route table"`
	`401`	`+ description = "The ID of the default route table of the Default VPC"`
`402`	`402`	`value = concat(aws_default_vpc.this.*.default_route_table_id, [""])[0]`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`output "default_vpc_instance_tenancy" {`
`406`		`- description = "Tenancy of instances spin up within VPC"`
	`406`	`+ description = "Tenancy of instances spin up within Default VPC"`
`407`	`407`	`value = concat(aws_default_vpc.this.*.instance_tenancy, [""])[0]`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`output "default_vpc_enable_dns_support" {`
`411`		`- description = "Whether or not the VPC has DNS support"`
	`411`	`+ description = "Whether or not the Default VPC has DNS support"`
`412`	`412`	`value = concat(aws_default_vpc.this.*.enable_dns_support, [""])[0]`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`output "default_vpc_enable_dns_hostnames" {`
`416`		`- description = "Whether or not the VPC has DNS hostname support"`
	`416`	`+ description = "Whether or not the Default VPC has DNS hostname support"`
`417`	`417`	`value = concat(aws_default_vpc.this.*.enable_dns_hostnames, [""])[0]`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`output "default_vpc_main_route_table_id" {`
`421`		`- description = "The ID of the main route table associated with this VPC"`
	`421`	`+ description = "The ID of the main route table associated with the Default VPC"`
`422`	`422`	`value = concat(aws_default_vpc.this.*.main_route_table_id, [""])[0]`
`423`	`423`	`}`
`424`	`424`