Fix error when creating double internal route53 recordset

convox · Apr 22, 2024 · c984151 · c984151
1 parent d45b8fb
commit c984151
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/provider/aws/formation/app.json.tmpl b/provider/aws/formation/app.json.tmpl
@@ -234,7 +234,7 @@
         "Condition": "InternalDomains",
         "Properties": {
           "HostedZoneId": { "Fn::ImportValue": { "Fn::Sub": "${Rack}:HostedZone" } },
-          "Name": { "Fn::Sub": "{{.Name}}.{{$.App}}.${Rack}.convox." },
+          "Name": { "Fn::Sub": "internal-{{.Name}}.{{$.App}}.${Rack}.convox." },
           "Type": "CNAME",
           "TTL": "3600",
           "ResourceRecords": [ { "Fn::ImportValue": { "Fn::Sub": "${Rack}:Domain{{ if .Internal }}Internal{{ end }}" } } ]
@@ -361,6 +361,9 @@
   {{ range .Manifest.Services }}
     "Service{{ upper .Name }}": {
       "Type": "AWS::CloudFormation::Stack",
+      {{ if .Port.Port }}
+      "DependsOn": "RecordSet{{ upper .Name }}Internal",
+      {{ end }}
       "Properties": {
         "NotificationARNs": [ "{{ $.Topic }}" ],
         "Parameters": {

diff --git a/provider/aws/formation/service.json.tmpl b/provider/aws/formation/service.json.tmpl
@@ -354,14 +354,14 @@
             }
         },
         {{ end }}
-        "RecordSetInternal": {
+        "RecordSetInternalDomain": {
           "Type": "AWS::Route53::RecordSet",
           "Condition": "InternalDomains",
           "Properties": {
             "HostedZoneId": { "Fn::ImportValue": { "Fn::Sub": "${Rack}:HostedZone" } },
             "Name": { "Fn::Sub": "{{.Name}}.{{$.App}}.${Rack}.convox." },
             "Type": "CNAME",
-            "TTL": "3600",
+            "TTL": "3611",
             "ResourceRecords": [ { "Fn::ImportValue": { "Fn::Sub": "${Rack}:Domain{{ if .Internal }}Internal{{ end }}" } } ]
           }
         },