feat(appmesh): add listener timeout to Virtual Nodes

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts

@@ -259,17 +259,28 @@ export class AppMeshExtension extends ServiceExtension {
       throw new Error('You must add a CloudMap namespace to the ECS cluster in order to use the AppMesh extension');
     }
 
+    function addListener(protocol: appmesh.Protocol, port: number): appmesh.VirtualNodeListener {
+      switch (protocol) {
+        case appmesh.Protocol.HTTP :
+          return appmesh.VirtualNodeListener.http({ port });
+
+        case appmesh.Protocol.HTTP2 :
+          return appmesh.VirtualNodeListener.http2({ port });
+
+        case appmesh.Protocol.GRPC :
+          return appmesh.VirtualNodeListener.grpc({ port });
+
+        case appmesh.Protocol.TCP :
+          return appmesh.VirtualNodeListener.tcp({ port });
+      }
+    }
+
     // Create a virtual node for the name service
     this.virtualNode = new appmesh.VirtualNode(this.scope, `${this.parentService.id}-virtual-node`, {
       mesh: this.mesh,
       virtualNodeName: this.parentService.id,
       cloudMapService: service.cloudMapService,
-      listener: {
-        portMapping: {
-          port: containerextension.trafficPort,
-          protocol: this.protocol,
-        },
-      },
+      listeners: [addListener(this.protocol, containerextension.trafficPort)],
     });
 
     // Create a virtual router for this service. This allows for retries

packages/@aws-cdk/aws-appmesh/README.md

@@ -143,11 +143,8 @@ const service = namespace.createService('Svc');
 
 const node = mesh.addVirtualNode('virtual-node', {
   cloudMapService: service,
-  listener: {
-    portMapping: {
-      port: 8081,
-      protocol: Protocol.HTTP,
-    },
+  listeners: [appmesh.VirtualNodeListener.httpNodeListener({
+    port: 8081,
     healthCheck: {
       healthyThreshold: 3,
       interval: Duration.seconds(5), // minimum
@@ -157,9 +154,9 @@ const node = mesh.addVirtualNode('virtual-node', {
       timeout: Duration.seconds(2), // minimum
       unhealthyThreshold: 2,
     },
-  },
+  })],
   accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
-})
+});
 ```
 
 Create a `VirtualNode` with the the constructor and add tags.
@@ -168,11 +165,8 @@ Create a `VirtualNode` with the the constructor and add tags.
 const node = new VirtualNode(this, 'node', {
   mesh,
   cloudMapService: service,
-  listener: {
-    portMapping: {
-      port: 8080,
-      protocol: Protocol.HTTP,
-    },
+  listeners: [appmesh.VirtualNodeListener.httpNodeListener({
+    port: 8080,
     healthCheck: {
       healthyThreshold: 3,
       interval: Duration.seconds(5), // min
@@ -181,15 +175,18 @@ const node = new VirtualNode(this, 'node', {
       protocol: Protocol.HTTP,
       timeout: Duration.seconds(2), // min
       unhealthyThreshold: 2,
+    }, 
+    timeout: {
+      idle: cdk.Duration.seconds(5),
     },
-  },
+  })],
   accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
 });
 
 cdk.Tag.add(node, 'Environment', 'Dev');
 ```
 
-The listeners property can be left blank and added later with the `node.addListeners()` method. The `healthcheck` property is optional but if specifying a listener, the `portMappings` must contain at least one property.
+The listeners property can be left blank and added later with the `node.addListeners()` method. The `healthcheck` and `timeout` properties are optional but if specifying a listener, the `port` must be added.
 
 ## Adding a Route
 

packages/@aws-cdk/aws-appmesh/lib/index.ts

@@ -6,6 +6,7 @@ export * from './shared-interfaces';
 export * from './virtual-node';
 export * from './virtual-router';
 export * from './virtual-service';
+export * from './virtual-node-listener';
 export * from './virtual-gateway';
 export * from './virtual-gateway-listener';
 export * from './gateway-route';

packages/@aws-cdk/aws-appmesh/lib/shared-interfaces.ts

@@ -87,25 +87,6 @@ export interface PortMapping {
   readonly protocol: Protocol;
 }
 
-/**
- * Represents the properties needed to define healthy and active listeners for nodes
- */
-export interface VirtualNodeListener {
-  /**
-   * Array of PortMappingProps for the listener
-   *
-   * @default - HTTP port 8080
-   */
-  readonly portMapping?: PortMapping;
-
-  /**
-   * Health checking strategy upstream nodes should use when communicating with the listener
-   *
-   * @default - no healthcheck
-   */
-  readonly healthCheck?: HealthCheck;
-}
-
 /**
  * All Properties for Envoy Access logs for mesh endpoints
  */