Merge pull request #18 from Samseppiol/master

Convert component to use new dns convention
theonestack · Mar 26, 2020 · d1d0a6c · d1d0a6c
2 parents 0c3ba51 + 9351a82
commit d1d0a6c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/aurora-mysql.cfndsl.rb b/aurora-mysql.cfndsl.rb
@@ -124,17 +124,17 @@
 
     Route53_RecordSet(:DBClusterReaderRecord) {
       Condition(:EnableReader)
-      HostedZoneName FnJoin('', [ Ref('EnvironmentName'), '.', Ref('DnsDomain'), '.'])
-      Name FnJoin('', [ external_parameters[:hostname_read_endpoint], '.', Ref('EnvironmentName'), '.', Ref('DnsDomain'), '.' ])
+      HostedZoneName FnSub("#{external_parameters[:dns_format]}.")
+      Name FnSub("#{external_parameters[:hostname_read_endpoint]}.#{external_parameters[:dns_format]}.")
       Type 'CNAME'
       TTL '60'
       ResourceRecords [ FnGetAtt('DBCluster','ReadEndpoint.Address') ]
     }
   end
 
   Route53_RecordSet(:DBHostRecord) {
-    HostedZoneName FnJoin('', [ Ref('EnvironmentName'), '.', Ref('DnsDomain'), '.'])
-    Name FnJoin('', [ external_parameters[:hostname], '.', Ref('EnvironmentName'), '.', Ref('DnsDomain'), '.' ])
+    HostedZoneName FnSub("#{external_parameters[:dns_format]}.")
+    Name FnSub("#{external_parameters[:hostname]}.#{external_parameters[:dns_format]}.")
     Type 'CNAME'
     TTL '60'
     ResourceRecords [ FnGetAtt('DBCluster','Endpoint.Address') ]

diff --git a/aurora-mysql.config.yaml b/aurora-mysql.config.yaml
@@ -1,3 +1,4 @@
+dns_format: ${EnvironmentName}.${DnsDomain}
 maximum_availability_zones: 5
 
 hostname: aurora2

diff --git a/tests/dns_format.test.yaml b/tests/dns_format.test.yaml
@@ -0,0 +1,6 @@
+test_metadata:
+  type: config
+  name: dns format
+  description: Converts component to use dns format config
+
+dns_format: ${EnvironmentName}.${DnsDomain}