Merge pull request #22931 from hashicorp/td-empty-valid-routes

ec2/routes: Remove empty validation
hashicorp · Feb 4, 2022 · 366e17e · 366e17e
2 parents 43f48aa + 8f81458
commit 366e17e
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 62 deletions.
diff --git a/.changelog/22931.txt b/.changelog/22931.txt
@@ -0,0 +1,11 @@
+```release-note:breaking-change
+resource/aws_route_table: These arguments can no longer be set to `""`: `route.*.cidr_block`, `route.*.ipv6_cidr_block`
+```
+
+```release-note:breaking-change
+resource/aws_default_route_table: These arguments can no longer be set to `""`: `route.*.cidr_block`, `route.*.ipv6_cidr_block`
+```
+
+```release-note:breaking-change
+resource/aws_route: Exactly one of these can be set: `destination_cidr_block`, `destination_ipv6_cidr_block`, `destination_prefix_list_id`. These arguments can no longer be set to `""`: `destination_cidr_block`, `destination_ipv6_cidr_block`.
+```
diff --git a/internal/service/ec2/default_route_table.go b/internal/service/ec2/default_route_table.go
@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -70,24 +69,18 @@ func ResourceDefaultRouteTable() *schema.Resource {
 						// Destinations.
 						///
 						"cidr_block": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.Any(
-								validation.StringIsEmpty,
-								verify.ValidIPv4CIDRNetworkAddress,
-							),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: verify.ValidIPv4CIDRNetworkAddress,
 						},
 						"destination_prefix_list_id": {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
 						"ipv6_cidr_block": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.Any(
-								validation.StringIsEmpty,
-								verify.ValidIPv6CIDRNetworkAddress,
-							),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: verify.ValidIPv6CIDRNetworkAddress,
 						},
 
 						//

diff --git a/internal/service/ec2/default_route_table_test.go b/internal/service/ec2/default_route_table_test.go
@@ -224,6 +224,10 @@ func TestAccEC2DefaultRouteTable_swap(t *testing.T) {
 }
 
 func TestAccEC2DefaultRouteTable_ipv4ToTransitGateway(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var routeTable ec2.RouteTable
 	resourceName := "aws_default_route_table.test"
 	tgwResourceName := "aws_ec2_transit_gateway.test"
@@ -256,6 +260,10 @@ func TestAccEC2DefaultRouteTable_ipv4ToTransitGateway(t *testing.T) {
 }
 
 func TestAccEC2DefaultRouteTable_ipv4ToVPCEndpoint(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var routeTable ec2.RouteTable
 	resourceName := "aws_default_route_table.test"
 	vpceResourceName := "aws_vpc_endpoint.test"
@@ -1034,8 +1042,8 @@ resource "aws_default_route_table" "test" {
   default_route_table_id = aws_vpc.test.default_route_table_id
 
   route {
-    cidr_block      = local.ipv6 ? "" : local.destination
-    ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : ""
+    cidr_block      = local.ipv6 ? null : local.destination
+    ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : null
     gateway_id      = aws_internet_gateway.test.id
   }
 

diff --git a/internal/service/ec2/route.go b/internal/service/ec2/route.go
@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -62,28 +61,25 @@ func ResourceRoute() *schema.Resource {
 			// Destinations.
 			///
 			"destination_cidr_block": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-				ValidateFunc: validation.Any(
-					validation.StringIsEmpty,
-					verify.ValidIPv4CIDRNetworkAddress,
-				),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: verify.ValidIPv4CIDRNetworkAddress,
+				ExactlyOneOf: []string{"destination_cidr_block", "destination_ipv6_cidr_block", "destination_prefix_list_id"},
 			},
 			"destination_ipv6_cidr_block": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-				ValidateFunc: validation.Any(
-					validation.StringIsEmpty,
-					verify.ValidIPv6CIDRNetworkAddress,
-				),
+				Type:             schema.TypeString,
+				Optional:         true,
+				ForceNew:         true,
+				ValidateFunc:     verify.ValidIPv6CIDRNetworkAddress,
 				DiffSuppressFunc: suppressEqualCIDRBlockDiffs,
+				ExactlyOneOf:     []string{"destination_cidr_block", "destination_ipv6_cidr_block", "destination_prefix_list_id"},
 			},
 			"destination_prefix_list_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ExactlyOneOf: []string{"destination_cidr_block", "destination_ipv6_cidr_block", "destination_prefix_list_id"},
 			},
 
 			//

diff --git a/internal/service/ec2/route_data_source_test.go b/internal/service/ec2/route_data_source_test.go
@@ -50,6 +50,10 @@ func TestAccEC2RouteDataSource_basic(t *testing.T) {
 }
 
 func TestAccEC2RouteDataSource_transitGatewayID(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	dataSourceName := "data.aws_route.test"
 	resourceName := "aws_route.test"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

diff --git a/internal/service/ec2/route_table.go b/internal/service/ec2/route_table.go
@@ -12,7 +12,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
@@ -85,24 +84,18 @@ func ResourceRouteTable() *schema.Resource {
 						// Destinations.
 						///
 						"cidr_block": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.Any(
-								validation.StringIsEmpty,
-								verify.ValidIPv4CIDRNetworkAddress,
-							),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: verify.ValidIPv4CIDRNetworkAddress,
 						},
 						"destination_prefix_list_id": {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
 						"ipv6_cidr_block": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.Any(
-								validation.StringIsEmpty,
-								verify.ValidIPv6CIDRNetworkAddress,
-							),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: verify.ValidIPv6CIDRNetworkAddress,
 						},
 
 						//

diff --git a/internal/service/ec2/route_table_test.go b/internal/service/ec2/route_table_test.go
@@ -272,6 +272,10 @@ func TestAccEC2RouteTable_tags(t *testing.T) {
 }
 
 func TestAccEC2RouteTable_requireRouteDestination(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -382,6 +386,10 @@ func TestAccEC2RouteTable_Route_mode(t *testing.T) {
 }
 
 func TestAccEC2RouteTable_ipv4ToTransitGateway(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var routeTable ec2.RouteTable
 	resourceName := "aws_route_table.test"
 	tgwResourceName := "aws_ec2_transit_gateway.test"
@@ -418,6 +426,10 @@ func TestAccEC2RouteTable_ipv4ToTransitGateway(t *testing.T) {
 }
 
 func TestAccEC2RouteTable_ipv4ToVPCEndpoint(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var routeTable ec2.RouteTable
 	resourceName := "aws_route_table.test"
 	vpceResourceName := "aws_vpc_endpoint.test"
@@ -1842,8 +1854,8 @@ resource "aws_route_table" "test" {
   vpc_id = aws_vpc.test.id
 
   route {
-    cidr_block      = local.ipv6 ? "" : local.destination
-    ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : ""
+    cidr_block      = local.ipv6 ? null : local.destination
+    ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : null
     gateway_id      = aws_internet_gateway.test.id
   }
 

diff --git a/internal/service/ec2/route_test.go b/internal/service/ec2/route_test.go
@@ -761,6 +761,10 @@ func TestAccEC2Route_doesNotCrashWithVPCEndpoint(t *testing.T) {
 }
 
 func TestAccEC2Route_ipv4ToTransitGateway(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	resourceName := "aws_route.test"
 	tgwResourceName := "aws_ec2_transit_gateway.test"
@@ -806,6 +810,10 @@ func TestAccEC2Route_ipv4ToTransitGateway(t *testing.T) {
 }
 
 func TestAccEC2Route_ipv6ToTransitGateway(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	resourceName := "aws_route.test"
 	tgwResourceName := "aws_ec2_transit_gateway.test"
@@ -1025,6 +1033,10 @@ func TestAccEC2Route_conditionalCIDRBlock(t *testing.T) {
 }
 
 func TestAccEC2Route_IPv4Update_target(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	resourceName := "aws_route.test"
 	vgwResourceName := "aws_vpn_gateway.test"
@@ -1232,6 +1244,10 @@ func TestAccEC2Route_IPv4Update_target(t *testing.T) {
 }
 
 func TestAccEC2Route_IPv6Update_target(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	resourceName := "aws_route.test"
 	vgwResourceName := "aws_vpn_gateway.test"
@@ -1392,6 +1408,10 @@ func TestAccEC2Route_IPv6Update_target(t *testing.T) {
 }
 
 func TestAccEC2Route_ipv4ToVPCEndpoint(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	resourceName := "aws_route.test"
@@ -1793,6 +1813,10 @@ func TestAccEC2Route_prefixListToNatGateway(t *testing.T) {
 }
 
 func TestAccEC2Route_prefixListToTransitGateway(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
 	var route ec2.Route
 	resourceName := "aws_route.test"
 	tgwResourceName := "aws_ec2_transit_gateway.test"
@@ -2514,8 +2538,8 @@ resource "aws_route" "test" {
   route_table_id = aws_route_table.test.id
   gateway_id     = aws_internet_gateway.test.id
 
-  destination_cidr_block      = local.ipv6 ? "" : local.destination
-  destination_ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : ""
+  destination_cidr_block      = local.ipv6 ? null : local.destination
+  destination_ipv6_cidr_block = local.ipv6 ? local.destination_ipv6 : null
 }
 `, rName, destinationCidr, destinationIpv6Cidr, ipv6Route)
 }