Fixes hard-coded nats instance ID, addresses issue 46 reported (#47)

by @nouseforaname
cloudfoundry · Jul 26, 2022 · c84aab7 · c84aab7
1 parent 3f48787
commit c84aab7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/jobs/nats-tls/templates/migrator-config.json.erb b/jobs/nats-tls/templates/migrator-config.json.erb
@@ -1,17 +1,19 @@
 <%
     nats_instances = []
+    nats_hostname = ''
     nats_port = nil
     nats_migrate_port = 4243
     if_link("nats-tls") do |nats_tls_link|
+      nats_hostname = nats_tls_link.p("nats.hostname")
       nats_port = nats_tls_link.p("nats.port")
       nats_tls_link.instances.map do |instance|
-        nats_instances.push("#{instance.id}.#{nats_tls_link.p("nats.hostname")}")
+        nats_instances.push("#{instance.id}.#{nats_hostname}")
       end
     end
     %>
 {
     "bootstrap": <%= spec.bootstrap %>,
-    "address": <%= "\"#{spec.id}.nats.service.cf.internal\"" %>,
+    "address": <%= "\"#{spec.id}.#{nats_hostname}\"" %>,
     "nats_instances": [ <%= nats_instances.map { |e| "\"#{e}:#{nats_port}\""}.join(", ")  %> ],
     "nats_port": <%= nats_port %>,
     "nats_migrate_port": <%= nats_migrate_port %>,

diff --git a/jobs/nats/templates/migrator-config.json.erb b/jobs/nats/templates/migrator-config.json.erb
@@ -1,17 +1,19 @@
 <%
     nats_instances = []
+    nats_hostname = ''
     nats_port = nil
     nats_migrate_port = 4242
     if_link("nats") do |nats_link|
       nats_port = nats_link.p("nats.port")
+      nats_hostname = nats_link.p("nats.hostname")
       nats_link.instances.map do |instance|
-        nats_instances.push("#{instance.id}.#{nats_link.p("nats.hostname")}")
+        nats_instances.push("#{instance.id}.#{nats_hostname}")
       end
     end
     %>
 {
     "bootstrap": <%= spec.bootstrap %>,
-    "address": <%= "\"#{spec.id}.nats.service.cf.internal\"" %>,
+    "address": <%= "\"#{spec.id}.#{nats_hostname}\"" %>,
     "nats_instances": [ <%= nats_instances.map { |e| "\"#{e}:#{nats_port}\""}.join(", ")  %> ],
     "nats_port": <%= nats_port %>,
     "nats_migrate_port": <%= nats_migrate_port %>,