Add Support for Multiple Listeners on AppMesh Resources + enable port…

… matching for #27698
hashicorp · Jan 19, 2023 · 7f6b214 · 7f6b214
1 parent 4d3a4f7
commit 7f6b214
Show file tree

Hide file tree

Showing 13 changed files with 2,646 additions and 402 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -455,6 +455,11 @@ ENHANCEMENTS:
 * resource/aws_lightsail_instance: Add `ip_address_type` argument ([#27699](https://github.com/hashicorp/terraform-provider-aws/issues/27699))
 * resource/aws_security_group: Do not pass `from_port` or `to_port` values to the AWS API if a `rule`'s `protocol` value is `-1` or `all` ([#27642](https://github.com/hashicorp/terraform-provider-aws/issues/27642))
 * resource/aws_wafv2_rule_group: Correct maximum nesting level for `and_statement`, `not_statement`, `or_statement` and `rate_based_statement` ([#27682](https://github.com/hashicorp/terraform-provider-aws/issues/27682))
+* resource/aws_appmesh_virtual_node: Add Support for multiple listeners ([#27698](https://github.com/hashicorp/terraform-provider-aws/issues/27698))
+* resource/aws_appmesh_virtual_router: Add Support for multiple listeners ([#27698](https://github.com/hashicorp/terraform-provider-aws/issues/27698))
+* resource/aws_appmesh_virtual_gateway: Add Support for multiple listeners ([#27698](https://github.com/hashicorp/terraform-provider-aws/issues/27698))
+* resource/aws_appmesh_route: Add Support to match on port and specify weighted target port ([#27698](https://github.com/hashicorp/terraform-provider-aws/issues/27698))
+* resource/aws_appmesh_gateway_route: Add Support to match on port ([#27698](https://github.com/hashicorp/terraform-provider-aws/issues/27698))
 
 BUG FIXES:
 

diff --git a/internal/service/appmesh/appmesh_test.go b/internal/service/appmesh/appmesh_test.go
@@ -11,32 +11,39 @@ 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,
-			"httpRoute":  testAccGatewayRoute_HTTPRoute,
-			"http2Route": testAccGatewayRoute_HTTP2Route,
-			"tags":       testAccGatewayRoute_Tags,
+			"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,
 		},
 		"Mesh": {
 			"basic":        testAccMesh_basic,
 			"egressFilter": testAccMesh_egressFilter,
 			"tags":         testAccMesh_tags,
 		},
 		"Route": {
-			"grpcRoute":           testAccRoute_grpcRoute,
-			"grpcRouteEmptyMatch": testAccRoute_grpcRouteEmptyMatch,
-			"grpcRouteTimeout":    testAccRoute_grpcRouteTimeout,
-			"http2Route":          testAccRoute_http2Route,
-			"http2RouteTimeout":   testAccRoute_http2RouteTimeout,
-			"httpHeader":          testAccRoute_httpHeader,
-			"httpRetryPolicy":     testAccRoute_httpRetryPolicy,
-			"httpRoute":           testAccRoute_httpRoute,
-			"httpRouteTimeout":    testAccRoute_httpRouteTimeout,
-			"routePriority":       testAccRoute_routePriority,
-			"tcpRoute":            testAccRoute_tcpRoute,
-			"tcpRouteTimeout":     testAccRoute_tcpRouteTimeout,
-			"tags":                testAccRoute_tags,
+			"grpcRoute":               testAccRoute_grpcRoute,
+			"grpcRouteWithPortMatch":  testAccRoute_grpcRouteWithPortMatch,
+			"grpcRouteEmptyMatch":     testAccRoute_grpcRouteEmptyMatch,
+			"grpcRouteTimeout":        testAccRoute_grpcRouteTimeout,
+			"http2Route":              testAccRoute_http2Route,
+			"http2RouteWithPortMatch": testAccRoute_http2RouteWithPortMatch,
+			"http2RouteTimeout":       testAccRoute_http2RouteTimeout,
+			"httpHeader":              testAccRoute_httpHeader,
+			"httpRetryPolicy":         testAccRoute_httpRetryPolicy,
+			"httpRoute":               testAccRoute_httpRoute,
+			"httpRouteWithPortMatch":  testAccRoute_httpRouteWithPortMatch,
+			"httpRouteTimeout":        testAccRoute_httpRouteTimeout,
+			"routePriority":           testAccRoute_routePriority,
+			"tcpRoute":                testAccRoute_tcpRoute,
+			"tcpRouteWithPortMatch":   testAccRoute_tcpRouteWithPortMatch,
+			"tcpRouteTimeout":         testAccRoute_tcpRouteTimeout,
+			"tags":                    testAccRoute_tags,
 		},
 		"VirtualGateway": {
 			"basic":                      testAccVirtualGateway_basic,
@@ -47,6 +54,7 @@ func TestAccAppMesh_serial(t *testing.T) {
 			"listenerHealthChecks":       testAccVirtualGateway_ListenerHealthChecks,
 			"listenerTls":                testAccVirtualGateway_ListenerTLS,
 			"listenerValidation":         testAccVirtualGateway_ListenerValidation,
+			"multiListenerValidation":    testAccVirtualGateway_MultiListenerValidation,
 			"logging":                    testAccVirtualGateway_Logging,
 			"tags":                       testAccVirtualGateway_Tags,
 		},
@@ -64,12 +72,14 @@ func TestAccAppMesh_serial(t *testing.T) {
 			"listenerTimeout":            testAccVirtualNode_listenerTimeout,
 			"listenerTls":                testAccVirtualNode_listenerTLS,
 			"listenerValidation":         testAccVirtualNode_listenerValidation,
+			"multiListenerValidation":    testAccVirtualNode_multiListenerValidation,
 			"logging":                    testAccVirtualNode_logging,
 			"tags":                       testAccVirtualNode_tags,
 		},
 		"VirtualRouter": {
-			"basic": testAccVirtualRouter_basic,
-			"tags":  testAccVirtualRouter_tags,
+			"basic":         testAccVirtualRouter_basic,
+			"multiListener": testAccVirtualRouter_multiListener,
+			"tags":          testAccVirtualRouter_tags,
 		},
 		"VirtualService": {
 			"virtualNode":   testAccVirtualService_virtualNode,