Add App Mesh Virtual Gateway Target Ports

.changelog/29064.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_appmesh_gateway_route: Add `port` to `target` block in order to support Virtual Services with multiple listeners.
+```

internal/service/appmesh/appmesh_test.go

@@ -11,15 +11,18 @@ func TestAccAppMesh_serial(t *testing.T) {
 
 	testCases := map[string]map[string]func(t *testing.T){
 		"GatewayRoute": {
-			"basic":              testAccGatewayRoute_basic,
-			"disappears":         testAccGatewayRoute_disappears,
-			"grpcRoute":          testAccGatewayRoute_GRPCRoute,
-			"grpcRouteWithPort":  testAccGatewayRoute_GRPCRouteWithPort,
-			"httpRoute":          testAccGatewayRoute_HTTPRoute,
-			"httpRouteWithPort":  testAccGatewayRoute_HTTPRouteWithPort,
-			"http2Route":         testAccGatewayRoute_HTTP2Route,
-			"http2RouteWithPort": testAccGatewayRoute_HTTP2RouteWithPort,
-			"tags":               testAccGatewayRoute_Tags,
+			"basic":                testAccGatewayRoute_basic,
+			"disappears":           testAccGatewayRoute_disappears,
+			"grpcRoute":            testAccGatewayRoute_GRPCRoute,
+			"grpcRouteTargetPort":  testAccGatewayRoute_GRPCRouteTargetPort,
+			"grpcRouteWithPort":    testAccGatewayRoute_GRPCRouteWithPort,
+			"httpRoute":            testAccGatewayRoute_HTTPRoute,
+			"httpRouteTargetPort":  testAccGatewayRoute_HTTPRouteTargetPort,
+			"httpRouteWithPort":    testAccGatewayRoute_HTTPRouteWithPort,
+			"http2Route":           testAccGatewayRoute_HTTP2Route,
+			"http2RouteTargetPort": testAccGatewayRoute_HTTP2RouteTargetPort,
+			"http2RouteWithPort":   testAccGatewayRoute_HTTP2RouteWithPort,
+			"tags":                 testAccGatewayRoute_Tags,
 		},
 		"Mesh": {
 			"basic":        testAccMesh_basic,

internal/service/appmesh/gateway_route.go

@@ -105,6 +105,11 @@ func ResourceGatewayRoute() *schema.Resource {
 																	},
 																},
 															},
+															"port": {
+																Type:         schema.TypeInt,
+																Optional:     true,
+																ValidateFunc: validation.IsPortNumber,
+															},
 														},
 													},
 												},
@@ -176,6 +181,11 @@ func ResourceGatewayRoute() *schema.Resource {
 																	},
 																},
 															},
+															"port": {
+																Type:         schema.TypeInt,
+																Optional:     true,
+																ValidateFunc: validation.IsPortNumber,
+															},
 														},
 													},
 												},
@@ -343,6 +353,11 @@ func ResourceGatewayRoute() *schema.Resource {
 																	},
 																},
 															},
+															"port": {
+																Type:         schema.TypeInt,
+																Optional:     true,
+																ValidateFunc: validation.IsPortNumber,
+															},
 														},
 													},
 												},
@@ -755,6 +770,10 @@ func expandGatewayRouteTarget(vRouteTarget []interface{}) *appmesh.GatewayRouteT
 		routeTarget.VirtualService = virtualService
 	}
 
+	if vPort, ok := mRouteTarget["port"].(int); ok && vPort > 0 {
+		routeTarget.Port = aws.Int64(int64(vPort))
+	}
+
 	return routeTarget
 }
 
@@ -914,7 +933,9 @@ func flattenGatewayRouteTarget(routeTarget *appmesh.GatewayRouteTarget) []interf
 		return []interface{}{}
 	}
 
-	mRouteTarget := map[string]interface{}{}
+	mRouteTarget := map[string]interface{}{
+		"port": int(aws.Int64Value(routeTarget.Port)),
+	}
 
 	if virtualService := routeTarget.VirtualService; virtualService != nil {
 		mVirtualService := map[string]interface{}{