Merge pull request #26 from theonestack/hotflix/inline-support

switch to FnJoin for inline support
theonestack · Jul 5, 2023 · 290fe6f · 290fe6f
2 parents 61dec4f + c6ef9fa
commit 290fe6f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/aurora-mysql.cfndsl.rb b/aurora-mysql.cfndsl.rb
@@ -133,17 +133,17 @@
 
     Route53_RecordSet(:DBClusterReaderRecord) {
       Condition(:EnableReader)
-      HostedZoneName FnJoin('', [ "#{external_parameters[:dns_format]}", '.' ])
-      Name FnJoin('', [ "#{external_parameters[:hostname_read_endpoint]}.#{external_parameters[:dns_format]}", '.' ])
+      HostedZoneName FnJoin('', [ Ref(:EnvironmentName), '.', Ref(:DnsDomain), '.' ])
+      Name FnJoin('', [ "#{external_parameters[:hostname_read_endpoint]}", '.', Ref(:EnvironmentName), '.', Ref(:DnsDomain), '.' ])
       Type 'CNAME'
       TTL '60'
       ResourceRecords [ FnGetAtt('DBCluster','ReadEndpoint.Address') ]
     }
   end
 
   Route53_RecordSet(:DBHostRecord) {
-    HostedZoneName FnJoin('', [ "#{external_parameters[:dns_format]}", '.' ])
-    Name FnJoin('', [ "#{external_parameters[:hostname]}.#{external_parameters[:dns_format]}", '.' ])
+    HostedZoneName FnJoin('', [ Ref(:EnvironmentName), '.', Ref(:DnsDomain), '.' ])
+    Name FnJoin('', [ "#{external_parameters[:hostname]}", '.', Ref(:EnvironmentName), '.', Ref(:DnsDomain), '.' ])
     Type 'CNAME'
     TTL '60'
     ResourceRecords [ FnGetAtt('DBCluster','Endpoint.Address') ]