r/aws_route: Call SetId before WaitRouteReady

.changelog/24024.txt

@@ -0,0 +1,27 @@
+```release-note:bug
+resource/aws_route: Ensure that resource ID is set in case of wait-for-creation time out
+```
+
+```release-note:enhancement
+resource/aws_route: Add `core_network_arn` argument
+```
+
+```release-note:enhancement
+data-source/aws_route: Add `core_network_arn` argument
+```
+
+```release-note:enhancement
+resource/aws_route_table: Add `core_network_arn` argument to the `route` configuration block
+```
+
+```release-note:enhancement
+data-source/aws_route_table: Add 'routes.core_network_arn' attribute'
+```
+
+```release-note:enhancement
+resource/aws_default_route_table: Add `core_network_arn` argument to the `route` configuration block
+```
+
+```release-note:enhancement
+resource/aws_vpn_connection: Add `core_network_arn` and `core_network_attachment_arn` attributes
+```

internal/service/ec2/default_route_table.go

@@ -88,6 +88,10 @@ func ResourceDefaultRouteTable() *schema.Resource {
 						// These target attributes are a subset of the aws_route_table resource's target attributes
 						// as there are some targets that are not allowed in the default route table for a VPC.
 						//
+						"core_network_arn": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
 						"egress_only_gateway_id": {
 							Type:     schema.TypeString,
 							Optional: true,

internal/service/ec2/route.go

@@ -23,6 +23,7 @@ var routeValidDestinations = []string{
 
 var routeValidTargets = []string{
 	"carrier_gateway_id",
+	"core_network_arn",
 	"egress_only_gateway_id",
 	"gateway_id",
 	"instance_id",
@@ -91,6 +92,11 @@ func ResourceRoute() *schema.Resource {
 				ExactlyOneOf:  routeValidTargets,
 				ConflictsWith: []string{"destination_ipv6_cidr_block"}, // IPv4 destinations only.
 			},
+			"core_network_arn": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ExactlyOneOf: routeValidTargets,
+			},
 			"egress_only_gateway_id": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -203,6 +209,8 @@ func resourceRouteCreate(d *schema.ResourceData, meta interface{}) error {
 	switch target := aws.String(target); targetAttributeKey {
 	case "carrier_gateway_id":
 		input.CarrierGatewayId = target
+	case "core_network_arn":
+		input.CoreNetworkArn = target
 	case "egress_only_gateway_id":
 		input.EgressOnlyInternetGatewayId = target
 	case "gateway_id":
@@ -239,14 +247,14 @@ func resourceRouteCreate(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("error creating Route in Route Table (%s) with destination (%s): %w", routeTableID, destination, err)
 	}
 
+	d.SetId(RouteCreateID(routeTableID, destination))
+
 	_, err = WaitRouteReady(conn, routeFinder, routeTableID, destination, d.Timeout(schema.TimeoutCreate))
 
 	if err != nil {
 		return fmt.Errorf("error waiting for Route in Route Table (%s) with destination (%s) to become available: %w", routeTableID, destination, err)
 	}
 
-	d.SetId(RouteCreateID(routeTableID, destination))
-
 	return resourceRouteRead(d, meta)
 }
 
@@ -287,6 +295,7 @@ func resourceRouteRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.Set("carrier_gateway_id", route.CarrierGatewayId)
+	d.Set("core_network_arn", route.CoreNetworkArn)
 	d.Set("destination_cidr_block", route.DestinationCidrBlock)
 	d.Set("destination_ipv6_cidr_block", route.DestinationIpv6CidrBlock)
 	d.Set("destination_prefix_list_id", route.DestinationPrefixListId)
@@ -351,6 +360,8 @@ func resourceRouteUpdate(d *schema.ResourceData, meta interface{}) error {
 	switch target := aws.String(target); targetAttributeKey {
 	case "carrier_gateway_id":
 		input.CarrierGatewayId = target
+	case "core_network_arn":
+		input.CoreNetworkArn = target
 	case "egress_only_gateway_id":
 		input.EgressOnlyInternetGatewayId = target
 	case "gateway_id":

internal/service/ec2/route_data_source.go

@@ -33,7 +33,6 @@ func DataSourceRoute() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-
 			"destination_prefix_list_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -48,6 +47,11 @@ func DataSourceRoute() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"core_network_arn": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"egress_only_gateway_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -132,6 +136,10 @@ func dataSourceRouteRead(d *schema.ResourceData, meta interface{}) error {
 			continue
 		}
 
+		if v, ok := d.GetOk("core_network_arn"); ok && aws.StringValue(r.CoreNetworkArn) != v.(string) {
+			continue
+		}
+
 		if v, ok := d.GetOk("egress_only_gateway_id"); ok && aws.StringValue(r.EgressOnlyInternetGatewayId) != v.(string) {
 			continue
 		}
@@ -186,6 +194,7 @@ func dataSourceRouteRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.Set("carrier_gateway_id", route.CarrierGatewayId)
+	d.Set("core_network_arn", route.CoreNetworkArn)
 	d.Set("destination_cidr_block", route.DestinationCidrBlock)
 	d.Set("destination_ipv6_cidr_block", route.DestinationIpv6CidrBlock)
 	d.Set("destination_prefix_list_id", route.DestinationPrefixListId)

internal/service/ec2/route_table.go

@@ -27,6 +27,7 @@ var routeTableValidDestinations = []string{
 
 var routeTableValidTargets = []string{
 	"carrier_gateway_id",
+	"core_network_arn",
 	"egress_only_gateway_id",
 	"gateway_id",
 	"instance_id",
@@ -105,6 +106,10 @@ func ResourceRouteTable() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"core_network_arn": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
 						"egress_only_gateway_id": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -429,6 +434,10 @@ func resourceRouteTableHash(v interface{}) int {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
 
+	if v, ok := m["core_network_arn"]; ok {
+		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
+	}
+
 	if v, ok := m["egress_only_gateway_id"]; ok {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
@@ -681,6 +690,10 @@ func expandEc2CreateRouteInput(tfMap map[string]interface{}) *ec2.CreateRouteInp
 		apiObject.CarrierGatewayId = aws.String(v)
 	}
 
+	if v, ok := tfMap["core_network_arn"].(string); ok && v != "" {
+		apiObject.CoreNetworkArn = aws.String(v)
+	}
+
 	if v, ok := tfMap["egress_only_gateway_id"].(string); ok && v != "" {
 		apiObject.EgressOnlyInternetGatewayId = aws.String(v)
 	}
@@ -743,6 +756,10 @@ func expandEc2ReplaceRouteInput(tfMap map[string]interface{}) *ec2.ReplaceRouteI
 		apiObject.CarrierGatewayId = aws.String(v)
 	}
 
+	if v, ok := tfMap["core_network_arn"].(string); ok && v != "" {
+		apiObject.CoreNetworkArn = aws.String(v)
+	}
+
 	if v, ok := tfMap["egress_only_gateway_id"].(string); ok && v != "" {
 		apiObject.EgressOnlyInternetGatewayId = aws.String(v)
 	}
@@ -805,6 +822,10 @@ func flattenEc2Route(apiObject *ec2.Route) map[string]interface{} {
 		tfMap["carrier_gateway_id"] = aws.StringValue(v)
 	}
 
+	if v := apiObject.CoreNetworkArn; v != nil {
+		tfMap["core_network_arn"] = aws.StringValue(v)
+	}
+
 	if v := apiObject.EgressOnlyInternetGatewayId; v != nil {
 		tfMap["egress_only_gateway_id"] = aws.StringValue(v)
 	}

internal/service/ec2/route_table_data_source.go

@@ -71,6 +71,11 @@ func DataSourceRouteTable() *schema.Resource {
 							Computed: true,
 						},
 
+						"core_network_arn": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+
 						"egress_only_gateway_id": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -285,6 +290,9 @@ func dataSourceRoutesRead(conn *ec2.EC2, ec2Routes []*ec2.Route) []map[string]in
 		if r.CarrierGatewayId != nil {
 			m["carrier_gateway_id"] = *r.CarrierGatewayId
 		}
+		if r.CoreNetworkArn != nil {
+			m["core_network_arn"] = *r.CoreNetworkArn
+		}
 		if r.EgressOnlyInternetGatewayId != nil {
 			m["egress_only_gateway_id"] = *r.EgressOnlyInternetGatewayId
 		}