Merge pull request hashicorp#17573 from jsf9k/b-aws_vpn_connection

Allow local and remote IPv4 and IPv6 CIDRs to be of any size
coveooss · May 27, 2021 · f9080a5 · f9080a5
2 parents efa8b7c + f2eea4f
commit f9080a5
Show file tree

Hide file tree

Showing 4 changed files with 368 additions and 171 deletions.
diff --git a/.changelog/17573.txt b/.changelog/17573.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_vpn_connection: Allow `local_ipv4_network_cidr`, `remote_ipv4_network_cidr`, `local_ipv6_network_cidr`, and `remote_ipv6_network_cidr` to be CIDRs of any size
+```
diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go
@@ -38,6 +38,7 @@ func init() {
 func testAccErrorCheckSkipEC2(t *testing.T) resource.ErrorCheckFunc {
 	return testAccErrorCheckSkipMessagesContaining(t,
 		"VolumeTypeNotAvailableInRegion",
+		"Invalid value specified for Phase",
 	)
 }
 

diff --git a/aws/resource_aws_vpn_connection.go b/aws/resource_aws_vpn_connection.go
@@ -1742,13 +1742,13 @@ func validateVpnConnectionTunnelInsideIpv6CIDR() schema.SchemaValidateFunc {
 
 func validateLocalIpv4NetworkCidr() schema.SchemaValidateFunc {
 	return validation.All(
-		validation.IsCIDRNetwork(32, 32),
+		validation.IsCIDRNetwork(0, 32),
 	)
 }
 
 func validateLocalIpv6NetworkCidr() schema.SchemaValidateFunc {
 	return validation.All(
-		validation.IsCIDRNetwork(128, 128),
+		validation.IsCIDRNetwork(0, 128),
 	)
 }