fix: remove the filter if protos in both googleapis and gax (#229)

* fix: remove the filter if protos in both googleapis and gax * test: run monitoring in CI
googleapis · Feb 6, 2020 · 8d73e62 · 8d73e62
1 parent abff60f
commit 8d73e62
Show file tree

Hide file tree

Showing 16 changed files with 3,771 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,6 +34,7 @@ jobs:
             cp -r typescript/test/protos .test-out-showcase
             cp -r typescript/test/protos .test-out-keymanager
             cp -r typescript/test/protos .test-out-translate
+            cp -r typescript/test/protos .test-out-monitoring
             cp -r typescript/test/protos .test-out-texttospeech
             cp -r typescript/test/protos .test-out-dlp
       - persist_to_workspace:
@@ -122,6 +123,24 @@ jobs:
             npm run system-test
             npm run docs
             npm run docs-test
+  monitoringLibTest:
+    docker:
+      - image: circleci/node:10-browsers
+    steps: 
+      - checkout
+      - attach_workspace:
+          at: workspace
+      - run:
+          name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated Monitoring library
+          command: |
+            cd workspace/workspace/gapic-generator-typescript/.test-out-monitoring
+            npm install
+            npm test
+            npm run fix
+            npm run compile
+            npm run system-test
+            npm run docs
+            npm run docs-test
   dlpLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -180,6 +199,9 @@ workflows:
       - translateLibTest:
           requires:
             - testGenerator
+      - monitoringLibTest:
+          requires:
+            - testGenerator
       - ttsLibTest:
           requires:
             - testGenerator
diff --git a/typescript/src/schema/api.ts b/typescript/src/schema/api.ts
@@ -59,7 +59,6 @@ export class API {
     // parse resource map to Proto constructor
     this.protos = fileDescriptors
       .filter(fd => fd.name)
-      .filter(fd => !fs.existsSync(path.join(gaxProtosLocation, fd.name!)))
       .reduce((map, fd) => {
         map[fd.name!] = new Proto(
           fd,

diff --git a/typescript/test/testdata/monitoring/proto.list.baseline b/typescript/test/testdata/monitoring/proto.list.baseline
@@ -15,3 +15,5 @@ google/monitoring/v3/service.proto
 google/protobuf/empty.proto
 google/protobuf/field_mask.proto
 google/monitoring/v3/service_service.proto
+google/monitoring/v3/uptime.proto
+google/monitoring/v3/uptime_service.proto
diff --git a/typescript/test/testdata/monitoring/src/index.ts.baseline b/typescript/test/testdata/monitoring/src/index.ts.baseline
@@ -17,7 +17,9 @@
 // ** All changes to this file may be overwritten. **
 
 import * as v3 from './v3';
-export {v3};
+const ServiceMonitoringServiceClient = v3.ServiceMonitoringServiceClient;
+const UptimeCheckServiceClient = v3.UptimeCheckServiceClient;
+export {v3, ServiceMonitoringServiceClient, UptimeCheckServiceClient};
 // For compatibility with JavaScript libraries we need to provide this default export:
 // tslint:disable-next-line no-default-export
-export default {v3};
+export default {v3, ServiceMonitoringServiceClient, UptimeCheckServiceClient};
diff --git a/typescript/test/testdata/monitoring/src/v3/index.ts.baseline b/typescript/test/testdata/monitoring/src/v3/index.ts.baseline
@@ -16,4 +16,4 @@
 // ** https://github.com/googleapis/gapic-generator-typescript **
 // ** All changes to this file may be overwritten. **
 
-
+export {ServiceMonitoringServiceClient} from './service_monitoring_service_client';export {UptimeCheckServiceClient} from './uptime_check_service_client';