fix: service host and port undefined, apiEndpoint incorrect (#62)

* expose service options * update baseline * fix showcase localhost * fix failure * update baselne * add fields tob api * format
googleapis · Oct 19, 2019 · b172087 · b172087
1 parent 72bcb4c
commit b172087
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/templates/typescript_gapic/src/$version/$service_client.ts.njk b/templates/typescript_gapic/src/$version/$service_client.ts.njk
@@ -218,21 +218,21 @@ export class {{ service.name }}Client {
    * The DNS address for this API service.
    */
   static get servicePath() {
-    return '{{ service.hostname }}';
+    return '{{ api.hostName }}';
   }
   /**
    * The DNS address for this API service - same as servicePath(),
    * exists for compatibility reasons.
    */
   static get apiEndpoint() {
-    return 'localhost';
+    return '{{ api.hostName }}';
   }
 
   /**
    * The port for this API service.
    */
   static get port() {
-    return {{ service.port }};
+    return {{ api.port }};
   }
 
   /**

diff --git a/typescript/src/schema/api.ts b/typescript/src/schema/api.ts
@@ -2,6 +2,7 @@ import * as plugin from '../../../pbjs-genfiles/plugin';
 
 import { Naming } from './naming';
 import { Proto } from './proto';
+import { fstat } from 'fs-extra';
 
 export interface ProtosMap {
   [filename: string]: Proto;
@@ -10,6 +11,9 @@ export interface ProtosMap {
 export class API {
   naming: Naming;
   protos: ProtosMap;
+  hostName?: string;
+  port?: string;
+  // oauth_scopes: plugin.google.protobuf.IServiceOptions.prototype[".google.api.oauthScopes"];
   // TODO: subpackages
 
   constructor(
@@ -30,6 +34,21 @@ export class API {
         },
         {} as ProtosMap
       );
+    fileDescriptors.forEach(fd => {
+      if (fd.service) {
+        fd.service.forEach(service => {
+          if (service.options) {
+            const serviceOption = service.options;
+            if (serviceOption['.google.api.defaultHost']) {
+              const defaultHost = serviceOption['.google.api.defaultHost'];
+              const arr = defaultHost.split(':');
+              this.hostName = arr[0] || 'localhost';
+              this.port = arr.length > 1 ? arr[1] : '443';
+            }
+          }
+        });
+      }
+    });
   }
 
   get services() {

diff --git a/typescript/test/testdata/keymanager/src/v1/keymanagementservice_client.ts.baseline b/typescript/test/testdata/keymanager/src/v1/keymanagementservice_client.ts.baseline
@@ -180,21 +180,21 @@ export class KeyManagementServiceClient {
    * The DNS address for this API service.
    */
   static get servicePath() {
-    return '';
+    return 'cloudkms.googleapis.com';
   }
   /**
    * The DNS address for this API service - same as servicePath(),
    * exists for compatibility reasons.
    */
   static get apiEndpoint() {
-    return 'localhost';
+    return 'cloudkms.googleapis.com';
   }
 
   /**
    * The port for this API service.
    */
   static get port() {
-    return 0;
+    return 443;
   }
 
   /**