refactor: move things around (#241)

googleapis · Feb 12, 2020 · b692661 · b692661
1 parent 2a94e91
commit b692661
Show file tree

Hide file tree

Showing 252 changed files with 7,758 additions and 978 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   testGenerator:
     docker:
       - image: circleci/node:10-browsers
-    working_directory: /tmp/workspace/gapic-generator-typescript
+    working_directory: /home/circleci/project/gapic-generator-typescript
     steps:
       - checkout
       - run:
@@ -31,17 +31,14 @@ jobs:
       - run:
           name: copy protos to generated client library
           command: |
-            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
+            for dir in .test-out-* ; do
+              cp -r test-fixtures/protos $dir
+            done
       - persist_to_workspace:
-          root: /tmp
+          root: /home/circleci/project
           paths:
-            - workspace
-  showcaseTsTestApplication:
+            - gapic-generator-typescript
+  showcaseTestApplications:
     docker:
       - image: circleci/node:10-browsers
     steps: 
@@ -50,23 +47,14 @@ jobs:
           at: workspace
       - run:
           name: Run showcase test for Typescript users
-          command: |
-            cd workspace/workspace/gapic-generator-typescript
-            npm run ts-test-application
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript
+          command: npm run ts-test-application
           environment:
             NPM_CONFIG_PREFIX: /tmp/.npm-global
-  showcaseJsTestApplication:
-    docker:
-      - image: circleci/node:10-browsers
-    steps: 
-      - checkout
-      - attach_workspace:
-          at: workspace
       - run:
           name: Run showcase test for JavaScript users
-          command: |
-            cd workspace/workspace/gapic-generator-typescript
-            npm run js-test-application
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript
+          command: npm run js-test-application
           environment:
             NPM_CONFIG_PREFIX: /tmp/.npm-global
   showcaseLibTest:
@@ -78,15 +66,14 @@ jobs:
           at: workspace
       - run:
           name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated Showcase library
-          command: |
-            cd workspace/workspace/gapic-generator-typescript/.test-out-showcase
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-showcase
+          command: &alltests |
             npm install
             npm test
             npm run fix
             npm run compile
             npm run system-test
             npm run docs
-            npm run docs-test
   kmsLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -96,15 +83,8 @@ jobs:
           at: workspace
       - run:
           name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated KMS library
-          command: |
-            cd workspace/workspace/gapic-generator-typescript/.test-out-keymanager
-            npm install
-            npm test
-            npm run fix
-            npm run compile
-            npm run system-test
-            npm run docs
-            npm run docs-test
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-kms
+          command: *alltests
   translateLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -114,15 +94,8 @@ jobs:
           at: workspace
       - run:
           name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated Translate library
-          command: |
-            cd workspace/workspace/gapic-generator-typescript/.test-out-translate
-            npm install
-            npm test
-            npm run fix
-            npm run compile
-            npm run system-test
-            npm run docs
-            npm run docs-test
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-translate
+          command: *alltests
   monitoringLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -132,13 +105,8 @@ jobs:
           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
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-monitoring
+          command: *alltests
   dlpLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -147,15 +115,9 @@ jobs:
       - attach_workspace:
           at: workspace
       - run:
-          name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated dlp library
-          command: |
-            cd workspace/workspace/gapic-generator-typescript/.test-out-dlp
-            npm install
-            npm test
-            npm run fix
-            npm run compile
-            npm run system-test
-            npm run docs
+          name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated DLP library
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-dlp
+          command: *alltests
   ttsLibTest:
     docker:
       - image: circleci/node:10-browsers
@@ -165,24 +127,14 @@ jobs:
           at: workspace
       - run:
           name: Run unit tests, system tests, jsdoc generation, and gts fix of the generated Text-to-Speech library
-          command: |
-            cd workspace/workspace/gapic-generator-typescript/.test-out-texttospeech
-            npm install
-            npm test
-            npm run fix
-            npm run compile
-            npm run system-test
-            npm run docs
-            npm run docs-test
+          working_directory: /home/circleci/project/workspace/gapic-generator-typescript/.test-out-texttospeech
+          command: *alltests
 workflows:
   version: 2
   tests:
     jobs:
       - testGenerator
-      - showcaseTsTestApplication:
-          requires:
-            - testGenerator
-      - showcaseJsTestApplication:
+      - showcaseTestApplications:
           requires:
             - testGenerator
       - showcaseLibTest:

diff --git a/...ipt/test/testdata/dlp/.gitignore.baseline → baselines/dlp/.gitignore.baseline b/...ipt/test/testdata/dlp/.gitignore.baseline → baselines/dlp/.gitignore.baseline
diff --git a/...ript/test/testdata/dlp/.jsdoc.js.baseline → baselines/dlp/.jsdoc.js.baseline b/...ript/test/testdata/dlp/.jsdoc.js.baseline → baselines/dlp/.jsdoc.js.baseline
diff --git a/.../test/testdata/dlp/.mocharc.json.baseline → baselines/dlp/.mocharc.json.baseline b/.../test/testdata/dlp/.mocharc.json.baseline → baselines/dlp/.mocharc.json.baseline
diff --git a/...tdata/dlp/linkinator.config.json.baseline → ...lines/dlp/linkinator.config.json.baseline b/...tdata/dlp/linkinator.config.json.baseline → ...lines/dlp/linkinator.config.json.baseline
diff --git a/typescript/test/testdata/dlp/package.json → baselines/dlp/package.json b/typescript/test/testdata/dlp/package.json → baselines/dlp/package.json
diff --git a/...t/test/testdata/dlp/package.json.baseline → baselines/dlp/package.json.baseline b/...t/test/testdata/dlp/package.json.baseline → baselines/dlp/package.json.baseline
diff --git a/...ipt/test/testdata/dlp/proto.list.baseline → baselines/dlp/proto.list.baseline b/...ipt/test/testdata/dlp/proto.list.baseline → baselines/dlp/proto.list.baseline
diff --git a/...rotos/google/cloud/common_resources.proto → ...gle/cloud/common_resources.proto.baseline b/...rotos/google/cloud/common_resources.proto → ...gle/cloud/common_resources.proto.baseline
diff --git a/...st/protos/google/privacy/dlp/v2/dlp.proto → .../google/privacy/dlp/v2/dlp.proto.baseline b/...st/protos/google/privacy/dlp/v2/dlp.proto → .../google/privacy/dlp/v2/dlp.proto.baseline
diff --git a/...rotos/google/privacy/dlp/v2/storage.proto → ...gle/privacy/dlp/v2/storage.proto.baseline b/...rotos/google/privacy/dlp/v2/storage.proto → ...gle/privacy/dlp/v2/storage.proto.baseline
diff --git a/...t/test/testdata/dlp/src/index.ts.baseline → baselines/dlp/src/index.ts.baseline b/...t/test/testdata/dlp/src/index.ts.baseline → baselines/dlp/src/index.ts.baseline
diff --git a/...dlp/src/v2/dlp_service_client.ts.baseline → ...dlp/src/v2/dlp_service_client.ts.baseline b/...dlp/src/v2/dlp_service_client.ts.baseline → ...dlp/src/v2/dlp_service_client.ts.baseline
diff --git a/...2/dlp_service_client_config.json.baseline → ...2/dlp_service_client_config.json.baseline b/...2/dlp_service_client_config.json.baseline → ...2/dlp_service_client_config.json.baseline
diff --git a/...c/v2/dlp_service_proto_list.json.baseline → ...c/v2/dlp_service_proto_list.json.baseline b/...c/v2/dlp_service_proto_list.json.baseline → ...c/v2/dlp_service_proto_list.json.baseline
diff --git a/...est/testdata/dlp/src/v2/index.ts.baseline → baselines/dlp/src/v2/index.ts.baseline b/...est/testdata/dlp/src/v2/index.ts.baseline → baselines/dlp/src/v2/index.ts.baseline
diff --git a/...est/fixtures/sample/src/index.js.baseline → ...est/fixtures/sample/src/index.js.baseline b/...est/fixtures/sample/src/index.js.baseline → ...est/fixtures/sample/src/index.js.baseline
diff --git a/...est/fixtures/sample/src/index.ts.baseline → ...est/fixtures/sample/src/index.ts.baseline b/...est/fixtures/sample/src/index.ts.baseline → ...est/fixtures/sample/src/index.ts.baseline
diff --git a/...tdata/dlp/system-test/install.ts.baseline → ...lines/dlp/system-test/install.ts.baseline b/...tdata/dlp/system-test/install.ts.baseline → ...lines/dlp/system-test/install.ts.baseline
diff --git a/...dlp/test/gapic-dlp_service-v2.ts.baseline → ...dlp/test/gapic-dlp_service-v2.ts.baseline b/...dlp/test/gapic-dlp_service-v2.ts.baseline → ...dlp/test/gapic-dlp_service-v2.ts.baseline
diff --git a/.../test/testdata/dlp/tsconfig.json.baseline → baselines/dlp/tsconfig.json.baseline b/.../test/testdata/dlp/tsconfig.json.baseline → baselines/dlp/tsconfig.json.baseline
diff --git a/...pt/test/testdata/dlp/tslint.json.baseline → baselines/dlp/tslint.json.baseline b/...pt/test/testdata/dlp/tslint.json.baseline → baselines/dlp/tslint.json.baseline
diff --git a/...t/testdata/dlp/webpack.config.js.baseline → baselines/dlp/webpack.config.js.baseline b/...t/testdata/dlp/webpack.config.js.baseline → baselines/dlp/webpack.config.js.baseline
diff --git a/...t/testdata/keymanager/.gitignore.baseline → baselines/kms/.gitignore.baseline b/...t/testdata/keymanager/.gitignore.baseline → baselines/kms/.gitignore.baseline
diff --git a/...st/testdata/keymanager/.jsdoc.js.baseline → baselines/kms/.jsdoc.js.baseline b/...st/testdata/keymanager/.jsdoc.js.baseline → baselines/kms/.jsdoc.js.baseline
diff --git a/...estdata/keymanager/.mocharc.json.baseline → baselines/kms/.mocharc.json.baseline b/...estdata/keymanager/.mocharc.json.baseline → baselines/kms/.mocharc.json.baseline
diff --git a/...eymanager/linkinator.config.json.baseline → ...lines/kms/linkinator.config.json.baseline b/...eymanager/linkinator.config.json.baseline → ...lines/kms/linkinator.config.json.baseline
diff --git a/...ipt/test/testdata/keymanager/package.json → baselines/kms/package.json b/...ipt/test/testdata/keymanager/package.json → baselines/kms/package.json
diff --git a/...testdata/keymanager/package.json.baseline → baselines/kms/package.json.baseline b/...testdata/keymanager/package.json.baseline → baselines/kms/package.json.baseline
diff --git a/...t/testdata/keymanager/proto.list.baseline → baselines/kms/proto.list.baseline b/...t/testdata/keymanager/proto.list.baseline → baselines/kms/proto.list.baseline
@@ -3,7 +3,7 @@ google/protobuf/descriptor.proto
 google/api/annotations.proto
 google/protobuf/duration.proto
 google/protobuf/timestamp.proto
-google/kms/v1/resources.proto
+google/cloud/kms/v1/resources.proto
 google/protobuf/field_mask.proto
 google/api/client.proto
-google/kms/v1/service.proto
+google/cloud/kms/v1/service.proto
diff --git a/...test/protos/google/kms/v1/resources.proto → ...gle/cloud/kms/v1/resources.proto.baseline b/...test/protos/google/kms/v1/resources.proto → ...gle/cloud/kms/v1/resources.proto.baseline