Merge pull request #21 from Guslington/dns

refactor dns naming config
theonestack · May 30, 2019 · 064905d · 064905d
2 parents c681851 + 5924f4e
commit 064905d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/vpc.cfndsl.rb b/vpc.cfndsl.rb
@@ -39,13 +39,9 @@
     Tags vpc_tags
   end
 
-  dns_domain = FnJoin('.', [
-      Ref('EnvironmentName'), Ref('DnsDomain')
-  ])
-
   unless manage_ns_records
     Route53_HostedZone('HostedZone') do
-      Name dns_domain
+      Name FnSub(dns_format)
       HostedZoneConfig ({
         Comment: FnSub("Hosted Zone for ${EnvironmentName}")
       })
@@ -54,7 +50,7 @@
   end
 
   EC2_DHCPOptions('DHCPOptionSet') do
-    DomainName dns_domain
+    DomainName FnSub(dns_format)
     DomainNameServers ['AmazonProvidedDNS']
   end
 
@@ -299,7 +295,7 @@
 
   if defined?(flowlogs)
     log_retention = (flowlogs.is_a?(Hash) && flowlogs.has_key?('log_retention')) ? flowlogs['log_retention'] : 7
-    
+
 
     Resource('FlowLogsLogGroup') {
       Type 'AWS::Logs::LogGroup'
@@ -314,7 +310,7 @@
           Statement: [
             {
               Effect: 'Allow',
-              Principal: {  
+              Principal: {
                 Service: 'vpc-flow-logs.amazonaws.com'
               },
               Action: [ 'sts:AssumeRole' ]
@@ -341,7 +337,7 @@
           }
       ])
     end
-  
+
 
     EC2_FlowLog("VPCFlowLogs") do
       DeliverLogsPermissionArn FnGetAtt('PutVPCFlowLogsRole', 'Arn')

diff --git a/vpc.config.yaml b/vpc.config.yaml
@@ -37,6 +37,9 @@ enable_transit_vpc: false
 manage_ns_records: false
 #is false by default for backward compatibilty
 
+# Set the string to format the Fn::Sub HostedZone
+dns_format: ${EnvironmentName}.${DnsDomain}
+
 #
 # NACL Rules
 #
@@ -170,6 +173,7 @@ managed_accounts:
 config_export:
   global:
     - maximum_availability_zones
+    - dns_format
 
 lib_export:
   global: