feat: support apiEndpoint override in client constructor (#505)

Author: yoshi-automation

src/v2/config_service_v2_client.js

@@ -56,14 +56,18 @@ class ConfigServiceV2Client {
    *     API remote host.
    */
   constructor(opts) {
+    opts = opts || {};
     this._descriptors = {};
 
+    const servicePath =
+      opts.servicePath || opts.apiEndpoint || this.constructor.servicePath;
+
     // Ensure that options include the service address and port.
     opts = Object.assign(
       {
         clientConfig: {},
         port: this.constructor.port,
-        servicePath: this.constructor.servicePath,
+        servicePath,
       },
       opts
     );
@@ -176,6 +180,14 @@ class ConfigServiceV2Client {
     return 'logging.googleapis.com';
   }
 
+  /**
+   * The DNS address for this API service - same as servicePath(),
+   * exists for compatibility reasons.
+   */
+  static get apiEndpoint() {
+    return 'logging.googleapis.com';
+  }
+
   /**
    * The port for this API service.
    */

src/v2/logging_service_v2_client.js

@@ -56,14 +56,18 @@ class LoggingServiceV2Client {
    *     API remote host.
    */
   constructor(opts) {
+    opts = opts || {};
     this._descriptors = {};
 
+    const servicePath =
+      opts.servicePath || opts.apiEndpoint || this.constructor.servicePath;
+
     // Ensure that options include the service address and port.
     opts = Object.assign(
       {
         clientConfig: {},
         port: this.constructor.port,
-        servicePath: this.constructor.servicePath,
+        servicePath,
       },
       opts
     );
@@ -202,6 +206,14 @@ class LoggingServiceV2Client {
     return 'logging.googleapis.com';
   }
 
+  /**
+   * The DNS address for this API service - same as servicePath(),
+   * exists for compatibility reasons.
+   */
+  static get apiEndpoint() {
+    return 'logging.googleapis.com';
+  }
+
   /**
    * The port for this API service.
    */

src/v2/metrics_service_v2_client.js

@@ -55,14 +55,18 @@ class MetricsServiceV2Client {
    *     API remote host.
    */
   constructor(opts) {
+    opts = opts || {};
     this._descriptors = {};
 
+    const servicePath =
+      opts.servicePath || opts.apiEndpoint || this.constructor.servicePath;
+
     // Ensure that options include the service address and port.
     opts = Object.assign(
       {
         clientConfig: {},
         port: this.constructor.port,
-        servicePath: this.constructor.servicePath,
+        servicePath,
       },
       opts
     );
@@ -168,6 +172,14 @@ class MetricsServiceV2Client {
     return 'logging.googleapis.com';
   }
 
+  /**
+   * The DNS address for this API service - same as servicePath(),
+   * exists for compatibility reasons.
+   */
+  static get apiEndpoint() {
+    return 'logging.googleapis.com';
+  }
+
   /**
    * The port for this API service.
    */

synth.metadata

@@ -1,26 +1,26 @@
 {
-  "updateTime": "2019-06-02T12:17:31.339926Z",
+  "updateTime": "2019-06-05T14:21:10.388885Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.22.0",
-        "dockerImage": "googleapis/artman@sha256:72f6287a42490bfe1609aed491f29411af21df3f744199fe8bb8d276c1fdf419"
+        "version": "0.23.1",
+        "dockerImage": "googleapis/artman@sha256:9d5cae1454da64ac3a87028f8ef486b04889e351c83bb95e83b8fab3959faed0"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "a8ee1416f4c588f2ab92da72e7c1f588c784d3e6",
-        "internalRef": "250996044"
+        "sha": "47c142a7cecc6efc9f6f8af804b8be55392b795b",
+        "internalRef": "251635729"
       }
     },
     {
       "template": {
         "name": "node_library",
         "origin": "synthtool.gcp",
-        "version": "2019.4.10"
+        "version": "2019.5.2"
       }
     }
   ],

test/gapic-v2.js

@@ -23,6 +23,27 @@ const error = new Error();
 error.code = FAKE_STATUS_CODE;
 
 describe('LoggingServiceV2Client', () => {
+  it('has servicePath', () => {
+    const servicePath = loggingModule.v2.LoggingServiceV2Client.servicePath;
+    assert(servicePath);
+  });
+
+  it('has apiEndpoint', () => {
+    const apiEndpoint = loggingModule.v2.LoggingServiceV2Client.apiEndpoint;
+    assert(apiEndpoint);
+  });
+
+  it('has port', () => {
+    const port = loggingModule.v2.LoggingServiceV2Client.port;
+    assert(port);
+    assert(typeof port === 'number');
+  });
+
+  it('should create a client with no options', () => {
+    const client = new loggingModule.v2.LoggingServiceV2Client();
+    assert(client);
+  });
+
   describe('deleteLog', () => {
     it('invokes deleteLog without error', done => {
       const client = new loggingModule.v2.LoggingServiceV2Client({
@@ -321,6 +342,27 @@ describe('LoggingServiceV2Client', () => {
   });
 });
 describe('ConfigServiceV2Client', () => {
+  it('has servicePath', () => {
+    const servicePath = loggingModule.v2.ConfigServiceV2Client.servicePath;
+    assert(servicePath);
+  });
+
+  it('has apiEndpoint', () => {
+    const apiEndpoint = loggingModule.v2.ConfigServiceV2Client.apiEndpoint;
+    assert(apiEndpoint);
+  });
+
+  it('has port', () => {
+    const port = loggingModule.v2.ConfigServiceV2Client.port;
+    assert(port);
+    assert(typeof port === 'number');
+  });
+
+  it('should create a client with no options', () => {
+    const client = new loggingModule.v2.ConfigServiceV2Client();
+    assert(client);
+  });
+
   describe('listSinks', () => {
     it('invokes listSinks without error', done => {
       const client = new loggingModule.v2.ConfigServiceV2Client({
@@ -972,6 +1014,27 @@ describe('ConfigServiceV2Client', () => {
   });
 });
 describe('MetricsServiceV2Client', () => {
+  it('has servicePath', () => {
+    const servicePath = loggingModule.v2.MetricsServiceV2Client.servicePath;
+    assert(servicePath);
+  });
+
+  it('has apiEndpoint', () => {
+    const apiEndpoint = loggingModule.v2.MetricsServiceV2Client.apiEndpoint;
+    assert(apiEndpoint);
+  });
+
+  it('has port', () => {
+    const port = loggingModule.v2.MetricsServiceV2Client.port;
+    assert(port);
+    assert(typeof port === 'number');
+  });
+
+  it('should create a client with no options', () => {
+    const client = new loggingModule.v2.MetricsServiceV2Client();
+    assert(client);
+  });
+
   describe('listLogMetrics', () => {
     it('invokes listLogMetrics without error', done => {
       const client = new loggingModule.v2.MetricsServiceV2Client({