Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Feb 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -180,6 +199,9 @@ workflows:
- translateLibTest:
requires:
- testGenerator
- monitoringLibTest:
requires:
- testGenerator
- ttsLibTest:
requires:
- testGenerator
1 change: 0 additions & 1 deletion typescript/src/schema/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions typescript/test/testdata/monitoring/proto.list.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions typescript/test/testdata/monitoring/src/index.ts.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Loading