fix(ec2): private DNS for custom endpoints has incorrect default

package.json

@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "conventional-changelog-cli": "^2.0.31",
+    "eslint-plugin-node": "^11.0.0",
     "fs-extra": "^8.1.0",
     "jsii-diff": "^0.21.2",
     "jsii-pacmak": "^0.21.2",

packages/@aws-cdk/aws-ec2/lib/vpc-endpoint.ts

@@ -201,6 +201,11 @@ export interface IInterfaceVpcEndpointService {
    * The port of the service.
    */
   readonly port: number;
+
+  /**
+   * Whether Private DNS is supported by default.
+   */
+  readonly privateDnsDefault?: boolean;
 }
 
 /**
@@ -218,9 +223,15 @@ export class InterfaceVpcEndpointService implements IInterfaceVpcEndpointService
    */
   public readonly port: number;
 
+  /**
+   * Whether Private DNS is supported by default.
+   */
+  public readonly privateDnsDefault?: boolean;
+
   constructor(name: string, port?: number) {
     this.name = name;
     this.port = port || 443;
+    this.privateDnsDefault = false;
   }
 }
 
@@ -279,9 +290,15 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
    */
   public readonly port: number;
 
+  /**
+   * Whether Private DNS is supported by default.
+   */
+  public readonly privateDnsDefault?: boolean;
+
   constructor(name: string, prefix?: string, port?: number) {
     this.name = `${prefix || 'com.amazonaws'}.${Aws.REGION}.${name}`;
     this.port = port || 443;
+    this.privateDnsDefault = true;
   }
 }
 
@@ -298,7 +315,8 @@ export interface InterfaceVpcEndpointOptions {
    * Whether to associate a private hosted zone with the specified VPC. This
    * allows you to make requests to the service using its default DNS hostname.
    *
-   * @default true
+   * @default set by the instance of IInterfaceVpcEndpointService, or true if
+   * not defined by the instance of IInterfaceVpcEndpointService
    */
   readonly privateDnsEnabled?: boolean;
 
@@ -427,16 +445,21 @@ export class InterfaceVpcEndpoint extends VpcEndpoint implements IInterfaceVpcEn
 
     const subnets = props.vpc.selectSubnets({ ...props.subnets, onePerAz: true });
     const subnetIds = subnets.subnetIds;
-
-    const endpoint = new CfnVPCEndpoint(this, 'Resource', {
-      privateDnsEnabled: props.privateDnsEnabled !== undefined ? props.privateDnsEnabled : true,
+    const endpointProps = {
+      privateDnsEnabled: true,
       policyDocument: Lazy.anyValue({ produce: () => this.policyDocument }),
       securityGroupIds: securityGroups.map(s => s.securityGroupId),
       serviceName: props.service.name,
       vpcEndpointType: VpcEndpointType.INTERFACE,
       subnetIds,
       vpcId: props.vpc.vpcId
-    });
+    };
+    if (props.privateDnsEnabled !== undefined) {
+      endpointProps.privateDnsEnabled = props.privateDnsEnabled;
+    } else if (props.service.privateDnsDefault !== undefined) {
+      endpointProps.privateDnsEnabled = props.service.privateDnsDefault;
+    }
+    const endpoint = new CfnVPCEndpoint(this, 'Resource', endpointProps);
 
     this.vpcEndpointId = endpoint.ref;
     this.vpcEndpointCreationTimestamp = endpoint.attrCreationTimestamp;

packages/@aws-cdk/aws-ec2/test/test.vpc-endpoint.ts

@@ -345,10 +345,31 @@ export = {
 
       // THEN
       expect(stack).to(haveResource('AWS::EC2::VPCEndpoint', {
-        ServiceName: "com.amazonaws.vpce.us-east-1.vpce-svc-uuddlrlrbastrtsvc"
+        ServiceName: "com.amazonaws.vpce.us-east-1.vpce-svc-uuddlrlrbastrtsvc",
+        PrivateDnsEnabled: false
       }));
 
       test.done();
     },
+    'marketplace partner service interface endpoint'(test: Test) {
+      // GIVEN
+      const stack = new Stack();
+      const vpc = new Vpc(stack, 'VpcNetwork');
+
+      // WHEN
+      vpc.addInterfaceEndpoint('YourService', {
+        service: {name: "com.amazonaws.vpce.us-east-1.vpce-svc-mktplacesvcwprdns",
+                  port: 443,
+                  privateDnsDefault: true}
+      });
+
+      // THEN
+      expect(stack).to(haveResource('AWS::EC2::VPCEndpoint', {
+        ServiceName: "com.amazonaws.vpce.us-east-1.vpce-svc-mktplacesvcwprdns",
+        PrivateDnsEnabled: true
+      }));
+
+      test.done();
+    }
   }
 };