feat(app-mesh): support port property on weighted targets (#26114)

neovasili · web-flow · commit 54f91c802d99 · 2023-07-07T14:59:49.000Z
As described in the related issue, `WeightedTarget` L2 construct was missing `port` property which is already present in the L1 construct `CfnRoute`. This PR adds the missing `port` property to `WeightedTarget` L2 construct. The PR includes unit tests expansion to cover this new property appearance or absence. Closes #26083. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "32.0.0",
   "files": {
-    "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391": {
+    "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db": {
       "source": {
         "path": "mesh-stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
+          "objectKey": "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.template.json
@@ -468,6 +468,7 @@
       "Action": {
        "WeightedTargets": [
         {
+         "Port": 1234,
          "VirtualNode": {
           "Fn::GetAtt": [
            "meshgrpcnode5DE90B75",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/tree.json
@@ -807,7 +807,8 @@
                                           "VirtualNodeName"
                                         ]
                                       },
-                                      "weight": 1
+                                      "weight": 1,
+                                      "port": 1234
                                     }
                                   ]
                                 },
@@ -1264,7 +1265,7 @@
                 "path": "appmesh-routes-port-matchers/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.26"
+                  "version": "10.2.55"
                 }
               },
               "DeployAssert": {
@@ -1310,7 +1311,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.26"
+          "version": "10.2.55"
         }
       }
     },
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.ts
@@ -65,7 +65,7 @@ httpRouter.addRoute('http-route', {
 
 grpcRouter.addRoute('grpc-route', {
   routeSpec: appmesh.RouteSpec.grpc({
-    weightedTargets: [{ virtualNode: grpcNode }],
+    weightedTargets: [{ virtualNode: grpcNode, port: 1234 }],
     match: {
       port: 1234,
     },
diff --git a/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts b/packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts
@@ -24,6 +24,13 @@ export interface WeightedTarget {
    * @default 1
    */
   readonly weight?: number;
+
+  /**
+   * The port to match from the request.
+   *
+   * @default - do not match on port
+   */
+  readonly port?: number;
 }
 
 /**
@@ -603,6 +610,7 @@ function renderWeightedTargets(weightedTargets: WeightedTarget[]): CfnRoute.Weig
     renderedTargets.push({
       virtualNode: t.virtualNode.virtualNodeName,
       weight: t.weight == undefined ? 1 : t.weight,
+      port: t.port,
     });
   }
   return renderedTargets;
diff --git a/packages/aws-cdk-lib/aws-appmesh/test/route.test.ts b/packages/aws-cdk-lib/aws-appmesh/test/route.test.ts
@@ -280,6 +280,123 @@ describe('route', () => {
 
     });
 
+    test('should allow weighted targets with port specified', () => {
+      // GIVEN
+      const stack = new cdk.Stack();
+      const mesh = new appmesh.Mesh(stack, 'mesh', {
+        meshName: 'test-mesh',
+      });
+      const router = new appmesh.VirtualRouter(stack, 'router', {
+        mesh,
+      });
+
+      // WHEN
+      const node = mesh.addVirtualNode('test-node', {
+        serviceDiscovery: appmesh.ServiceDiscovery.dns('test'),
+        listeners: [appmesh.VirtualNodeListener.http()],
+      });
+
+      router.addRoute('test-http-route', {
+        routeSpec: appmesh.RouteSpec.http({
+          weightedTargets: [
+            {
+              virtualNode: node,
+              port: 1234,
+            },
+          ],
+          match: {
+            path: appmesh.HttpRoutePathMatch.startsWith('/node'),
+          },
+          timeout: {
+            idle: cdk.Duration.seconds(10),
+            perRequest: cdk.Duration.seconds(11),
+          },
+        }),
+      });
+
+      // THEN
+      Template.fromStack(stack).hasResourceProperties('AWS::AppMesh::Route', {
+        Spec: {
+          HttpRoute: {
+            Action: {
+              WeightedTargets: [
+                {
+                  VirtualNode: {
+                    'Fn::GetAtt': [
+                      'meshtestnodeF93946D4',
+                      'VirtualNodeName',
+                    ],
+                  },
+                  Weight: 1,
+                  Port: 1234,
+                },
+              ],
+            },
+          },
+        },
+        RouteName: 'test-http-route',
+      });
+
+    });
+
+    test('should not have weighted targets port when not specified', () => {
+      // GIVEN
+      const stack = new cdk.Stack();
+      const mesh = new appmesh.Mesh(stack, 'mesh', {
+        meshName: 'test-mesh',
+      });
+      const router = new appmesh.VirtualRouter(stack, 'router', {
+        mesh,
+      });
+
+      // WHEN
+      const node = mesh.addVirtualNode('test-node', {
+        serviceDiscovery: appmesh.ServiceDiscovery.dns('test'),
+        listeners: [appmesh.VirtualNodeListener.http()],
+      });
+
+      router.addRoute('test-http-route', {
+        routeSpec: appmesh.RouteSpec.http({
+          weightedTargets: [
+            {
+              virtualNode: node,
+            },
+          ],
+          match: {
+            path: appmesh.HttpRoutePathMatch.startsWith('/node'),
+          },
+          timeout: {
+            idle: cdk.Duration.seconds(10),
+            perRequest: cdk.Duration.seconds(11),
+          },
+        }),
+      });
+
+      // THEN
+      Template.fromStack(stack).hasResourceProperties('AWS::AppMesh::Route', {
+        Spec: {
+          HttpRoute: {
+            Action: {
+              WeightedTargets: [
+                {
+                  VirtualNode: {
+                    'Fn::GetAtt': [
+                      'meshtestnodeF93946D4',
+                      'VirtualNodeName',
+                    ],
+                  },
+                  Weight: 1,
+                  Port: Match.absent(),
+                },
+              ],
+            },
+          },
+        },
+        RouteName: 'test-http-route',
+      });
+
+    });
+
     test('should allow http retries', () => {
       // GIVEN
       const stack = new cdk.Stack();

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "32.0.0",`
`3`	`3`	`"files": {`
`4`		`- "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391": {`
	`4`	`+ "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db": {`
`5`	`5`	`"source": {`
`6`	`6`	`"path": "mesh-stack.template.json",`
`7`	`7`	`"packaging": "file"`
`8`	`8`	`},`
`9`	`9`	`"destinations": {`
`10`	`10`	`"current_account-current_region": {`
`11`	`11`	`"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",`
`12`		`- "objectKey": "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",`
	`12`	`+ "objectKey": "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",`
`13`	`13`	`"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,7 @@`
`468`	`468`	`"Action": {`
`469`	`469`	`"WeightedTargets": [`
`470`	`470`	`{`
	`471`	`+ "Port": 1234,`
`471`	`472`	`"VirtualNode": {`
`472`	`473`	`"Fn::GetAtt": [`
`473`	`474`	`"meshgrpcnode5DE90B75",`
Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,8 @@`
`807`	`807`	`"VirtualNodeName"`
`808`	`808`	`]`
`809`	`809`	`},`
`810`		`- "weight": 1`
	`810`	`+ "weight": 1,`
	`811`	`+ "port": 1234`
`811`	`812`	`}`
`812`	`813`	`]`
`813`	`814`	`},`
`@@ -1264,7 +1265,7 @@`
`1264`	`1265`	`"path": "appmesh-routes-port-matchers/DefaultTest/Default",`
`1265`	`1266`	`"constructInfo": {`
`1266`	`1267`	`"fqn": "constructs.Construct",`
`1267`		`- "version": "10.2.26"`
	`1268`	`+ "version": "10.2.55"`
`1268`	`1269`	`}`
`1269`	`1270`	`},`
`1270`	`1271`	`"DeployAssert": {`
`@@ -1310,7 +1311,7 @@`
`1310`	`1311`	`"path": "Tree",`
`1311`	`1312`	`"constructInfo": {`
`1312`	`1313`	`"fqn": "constructs.Construct",`
`1313`		`- "version": "10.2.26"`
	`1314`	`+ "version": "10.2.55"`
`1314`	`1315`	`}`
`1315`	`1316`	`}`
`1316`	`1317`	`},`