build: use bazel build (#352)

googleapis · Jul 6, 2020 · 5f1bdb7 · 5f1bdb7
1 parent 4f78335
commit 5f1bdb7
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 89 deletions.
diff --git a/packages/google-cloud-asset/src/index.ts b/packages/google-cloud-asset/src/index.ts
@@ -17,30 +17,30 @@
 // ** All changes to this file may be overwritten. **
 
 import * as v1beta1 from './v1beta1';
-import * as v1 from './v1';
 import * as v1p1beta1 from './v1p1beta1';
 import * as v1p2beta1 from './v1p2beta1';
 import * as v1p4beta1 from './v1p4beta1';
 import * as v1p5beta1 from './v1p5beta1';
+import * as v1 from './v1';
 
 const AssetServiceClient = v1.AssetServiceClient;
 
 export {
   v1beta1,
-  v1,
   v1p1beta1,
   v1p2beta1,
   v1p4beta1,
   v1p5beta1,
+  v1,
   AssetServiceClient,
 };
 export default {
   v1beta1,
-  v1,
   v1p1beta1,
   v1p2beta1,
   v1p4beta1,
   v1p5beta1,
+  v1,
   AssetServiceClient,
 };
 import * as protos from '../protos/protos';

diff --git a/packages/google-cloud-asset/src/v1/asset_service_client_config.json b/packages/google-cloud-asset/src/v1/asset_service_client_config.json
@@ -21,39 +21,48 @@
       },
       "methods": {
         "ExportAssets": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "BatchGetAssetsHistory": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "CreateFeed": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "GetFeed": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "ListFeeds": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "UpdateFeed": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "DeleteFeed": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "SearchAllResources": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 15000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "SearchAllIamPolicies": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 15000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         }
       }

diff --git a/packages/google-cloud-asset/src/v1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/src/v1beta1/asset_service_client_config.json b/packages/google-cloud-asset/src/v1beta1/asset_service_client_config.json
@@ -21,11 +21,13 @@
       },
       "methods": {
         "ExportAssets": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "BatchGetAssetsHistory": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         }
       }

diff --git a/packages/google-cloud-asset/src/v1beta1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1beta1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1beta1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1beta1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1beta1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/src/v1p1beta1/asset_service_client_config.json b/packages/google-cloud-asset/src/v1p1beta1/asset_service_client_config.json
@@ -21,11 +21,13 @@
       },
       "methods": {
         "SearchAllResources": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 15000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "SearchAllIamPolicies": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 15000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         }
       }

diff --git a/packages/google-cloud-asset/src/v1p1beta1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1p1beta1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1p1beta1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1p1beta1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1p1beta1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/src/v1p2beta1/asset_service_client_config.json b/packages/google-cloud-asset/src/v1p2beta1/asset_service_client_config.json
@@ -21,23 +21,28 @@
       },
       "methods": {
         "CreateFeed": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "GetFeed": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "ListFeeds": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "UpdateFeed": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "DeleteFeed": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         }
       }

diff --git a/packages/google-cloud-asset/src/v1p2beta1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1p2beta1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1p2beta1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1p2beta1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1p2beta1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/src/v1p4beta1/asset_service_client_config.json b/packages/google-cloud-asset/src/v1p4beta1/asset_service_client_config.json
@@ -6,6 +6,9 @@
         "idempotent": [
           "DEADLINE_EXCEEDED",
           "UNAVAILABLE"
+        ],
+        "unavailable": [
+          "UNAVAILABLE"
         ]
       },
       "retry_params": {
@@ -21,10 +24,12 @@
       },
       "methods": {
         "AnalyzeIamPolicy": {
-          "retry_codes_name": "non_idempotent",
+          "timeout_millis": 300000,
+          "retry_codes_name": "unavailable",
           "retry_params_name": "default"
         },
         "ExportIamPolicyAnalysis": {
+          "timeout_millis": 60000,
           "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         }

diff --git a/packages/google-cloud-asset/src/v1p4beta1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1p4beta1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1p4beta1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1p4beta1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1p4beta1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/src/v1p5beta1/asset_service_proto_list.json b/packages/google-cloud-asset/src/v1p5beta1/asset_service_proto_list.json
@@ -1,9 +1,4 @@
 [
   "../../protos/google/cloud/asset/v1p5beta1/asset_service.proto",
-  "../../protos/google/cloud/asset/v1p5beta1/assets.proto",
-  "../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
-  "../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
-  "../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
+  "../../protos/google/cloud/asset/v1p5beta1/assets.proto"
 ]
diff --git a/packages/google-cloud-asset/synth.metadata b/packages/google-cloud-asset/synth.metadata
@@ -3,23 +3,23 @@
     {
       "git": {
         "name": ".",
-        "remote": "https://github.com/googleapis/nodejs-asset.git",
-        "sha": "495f9ed3bea66db2f340db6b9566bf9c34cb7935"
+        "remote": "git@github.com:googleapis/nodejs-asset.git",
+        "sha": "1c34573510622fa114248f4f1682d910ef738905"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "7c577e89f1c84545113b393b7d7964473251d123",
-        "internalRef": "318542700"
+        "sha": "b085d0af47a9addead321737ebde7448fd179a51",
+        "internalRef": "319801234"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "dc9caca650c77b7039e2bbc3339ffb34ae78e5b7"
+        "sha": "303271797a360f8a439203413f13a160f2f5b3b4"
       }
     }
   ],
@@ -29,53 +29,53 @@
         "source": "googleapis",
         "apiName": "asset",
         "apiVersion": "v1beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
       "client": {
         "source": "googleapis",
         "apiName": "asset",
-        "apiVersion": "v1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "apiVersion": "v1p1beta1",
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
       "client": {
         "source": "googleapis",
         "apiName": "asset",
-        "apiVersion": "v1p1beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "apiVersion": "v1p2beta1",
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
       "client": {
         "source": "googleapis",
         "apiName": "asset",
-        "apiVersion": "v1p2beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "apiVersion": "v1p4beta1",
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
       "client": {
         "source": "googleapis",
         "apiName": "asset",
-        "apiVersion": "v1p4beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "apiVersion": "v1p5beta1",
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
       "client": {
         "source": "googleapis",
         "apiName": "asset",
-        "apiVersion": "v1p5beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "apiVersion": "v1",
+        "language": "nodejs",
+        "generator": "bazel"
       }
     }
   ]

diff --git a/packages/google-cloud-asset/synth.py b/packages/google-cloud-asset/synth.py
@@ -24,26 +24,15 @@
 AUTOSYNTH_MULTIPLE_COMMITS = True
 
 
-gapic = gcp.GAPICMicrogenerator()
-versions = ['v1beta1', 'v1', 'v1p1beta1', 'v1p2beta1', 'v1p4beta1', 'v1p5beta1']
+gapic = gcp.GAPICBazel()
+versions = ['v1beta1', 'v1p1beta1', 'v1p2beta1', 'v1p4beta1', 'v1p5beta1', 'v1']
 name = 'asset'
 for version in versions:
-    library = gapic.typescript_library(
-        name,
-        proto_path=f'google/cloud/{name}/{version}',
-        generator_args={
-            'grpc-service-config': f'google/cloud/{name}/{version}/cloud{name}_grpc_service_config.json',
-            'package-name': f'@google-cloud/{name}'
-        },
-        # This API has dependencies outside of its own folder so we list them here.
-        # Switching to bazel build should help get rid of this.
-        extra_proto_files=['google/cloud/common_resources.proto',
-                           'google/cloud/orgpolicy/v1', 'google/identity/accesscontextmanager'],
-        version=version),
+    library = gapic.node_library(name, version)
     # skip index, protos, package.json, and README.md
     s.copy(
         library,
-        excludes=['package.json']
+        excludes=['package.json', 'README.md']
     )
 
 # Copy common templates