Fix A_AAAA Dns record type

aws · Feb 25, 2019 · c284a09 · c284a09
1 parent ed47a55
commit c284a09
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/service.ts b/packages/@aws-cdk/aws-servicediscovery/lib/service.ts
@@ -29,7 +29,6 @@ export interface IService extends cdk.IConstruct {
   readonly dnsRecordType: DnsRecordType;
 }
 
-
 /**
  * Basic props needed to create a service in a given namespace. Used by HttpNamespace.createService
  */
@@ -170,16 +169,10 @@ export class Service extends cdk.Construct implements IService {
       : RoutingPolicy.Multivalue;
 
     const dnsRecordType = props.dnsRecordType !== undefined ? props.dnsRecordType : DnsRecordType.A;
-
     const dnsConfig = props.namespace.type === NamespaceType.Http
       ? undefined
       : {
-          dnsRecords: [
-            {
-              type: dnsRecordType,
-              ttl: props.dnsTtlSec !== undefined ? props.dnsTtlSec.toString() : '60',
-            }
-          ],
+          dnsRecords: _getDnsRecords(dnsRecordType, props.dnsTtlSec),
           namespaceId: props.namespace.namespaceId,
           routingPolicy,
         };
@@ -214,7 +207,23 @@ export class Service extends cdk.Construct implements IService {
     this.serviceArn = service.serviceArn;
     this.serviceId = service.serviceId;
     this.namespace = props.namespace;
-    this.dnsRecordType = props.dnsRecordType || DnsRecordType.A;
+    this.dnsRecordType = dnsRecordType;
+  }
+}
+
+function _getDnsRecords(dnsRecordType: DnsRecordType, dnsTtlSec?: number): DnsRecord[] {
+  const ttl = dnsTtlSec !== undefined ? dnsTtlSec.toString() : '60';
+
+  if (dnsRecordType === DnsRecordType.A_AAAA) {
+    return [{
+      type: DnsRecordType.A,
+      ttl
+    }, {
+      type: DnsRecordType.AAAA,
+      ttl,
+    }];
+  } else {
+    return [ { type: dnsRecordType, ttl} ];
   }
 }
 
@@ -252,7 +261,7 @@ export interface DnsRecord {
   /**
    * The time to live for the record
    */
-  ttlSec: number;
+  ttl: string;
 }
 
 /**

diff --git a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.ts b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.ts
@@ -8,14 +8,15 @@ const stack = new cdk.Stack(app, 'aws-servicediscovery-integ');
 const vpc = new ec2.VpcNetwork(stack, 'Vpc', { maxAZs: 2 });
 
 const namespace = new servicediscovery.PrivateDnsNamespace(stack, 'Namespace', {
-  name: "foobar.com",
+  name: "woobar.com",
   vpc,
 });
 
-new servicediscovery.Service(stack, 'Service', {
-  name: "frontend",
-  namespace,
-  dnsRecordType: servicediscovery.DnsRecordType.A_AAAA
+namespace.createService('Service', {
+  name: "bloop",
+  dnsRecordType: servicediscovery.DnsRecordType.A_AAAA,
+  dnsTtlSec: 30,
+  healthCheckCustomConfig: { failureThreshold: 2 }
 });
 
 app.run();
diff --git a/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts b/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts
@@ -141,8 +141,12 @@ export = {
               DnsRecords: [
                 {
                   TTL: "60",
-                  Type: "A, AAAA"
+                  Type: "A"
                 },
+                {
+                  TTL: "60",
+                  Type: "AAAA"
+                }
               ],
               NamespaceId: {
                 "Fn::GetAtt": [