Add TaggedAddresses to service register (#104)

silas · Oct 20, 2020 · be0473f · be0473f
1 parent dd82e91
commit be0473f
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -736,6 +736,7 @@ Options
  * checks (Object[], optional): service checks (see `check` above)
  * connect (Object, optional): specifies the [configuration](https://www.consul.io/api/agent/service.html#connect-structure) for Connect
  * proxy (Object, optional): specifies the [configuration](https://www.consul.io/docs/connect/registration/service-registration.html) for a Connect proxy instance
+ * taggedAddresses (Object, optional): specifies a map of explicit LAN and WAN addresses for the service instance
 
 Usage
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -234,6 +234,28 @@ function setIntervalContext(fn, ctx, timeout) {
   ctx.once('cancel', cancel);
 }
 
+function _createTaggedAddress(src) {
+  var dst = {};
+
+  if (src.hasOwnProperty('address')) dst.Address = src.address;
+  if (src.hasOwnProperty('port')) dst.Port = src.port;
+
+  return dst;
+}
+
+function _createTaggedAddresses(src) {
+  var dst = {};
+
+  if (src.lan) {
+    dst.lan = _createTaggedAddress(normalizeKeys(src.lan));
+  }
+  if (src.wan) {
+    dst.wan = _createTaggedAddress(normalizeKeys(src.wan));
+  }
+
+  return dst;
+}
+
 /**
  * Create node/server-level check object
  * Corresponds to CheckType in Consul Agent Endpoint:
@@ -347,6 +369,12 @@ function _createService(src, isSidecar) {
     dst.Proxy = _createServiceProxy(normalizeKeys(src.proxy));
   }
 
+  if (src.taggedaddresses) {
+    dst.TaggedAddresses = _createTaggedAddresses(
+      normalizeKeys(src.taggedaddresses)
+    );
+  }
+
   return dst;
 }
 

diff --git a/test/utils.js b/test/utils.js
@@ -548,6 +548,48 @@ describe('utils', function() {
           },
         },
       });
+
+      should(utils.createService({
+        taggedaddresses: {},
+      })).eql({
+        TaggedAddresses: {},
+      });
+
+      should(utils.createService({
+        taggedaddresses: {
+          lan: {},
+          wan: {},
+        },
+      })).eql({
+        TaggedAddresses: {
+          lan: {},
+          wan: {},
+        },
+      });
+
+      should(utils.createService({
+        taggedaddresses: {
+          lan: {
+            address: '127.0.0.1',
+            port: 8080,
+          },
+          wan: {
+            address: '10.0.0.1',
+            port: 80,
+          },
+        },
+      })).eql({
+        TaggedAddresses: {
+          lan: {
+            Address: '127.0.0.1',
+            Port: 8080,
+          },
+          wan: {
+            Address: '10.0.0.1',
+            Port: 80,
+          },
+        },
+      });
     });
 
     it('should not allow nested sidecars', function() {