Skip to content

Commit b59c5d4

Browse files
alexander-fensteralexander-fenster
authored
build: use bazel build (#352)
1 parent 69f269b commit b59c5d4

14 files changed

+71
-89
lines changed

‎packages/google-cloud-asset/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,30 @@
1717
// ** All changes to this file may be overwritten. **
1818

1919
import * as v1beta1 from './v1beta1';
20-
import * as v1 from './v1';
2120
import * as v1p1beta1 from './v1p1beta1';
2221
import * as v1p2beta1 from './v1p2beta1';
2322
import * as v1p4beta1 from './v1p4beta1';
2423
import * as v1p5beta1 from './v1p5beta1';
24+
import * as v1 from './v1';
2525

2626
const AssetServiceClient = v1.AssetServiceClient;
2727

2828
export {
2929
v1beta1,
30-
v1,
3130
v1p1beta1,
3231
v1p2beta1,
3332
v1p4beta1,
3433
v1p5beta1,
34+
v1,
3535
AssetServiceClient,
3636
};
3737
export default {
3838
v1beta1,
39-
v1,
4039
v1p1beta1,
4140
v1p2beta1,
4241
v1p4beta1,
4342
v1p5beta1,
43+
v1,
4444
AssetServiceClient,
4545
};
4646
import * as protos from '../protos/protos';

‎packages/google-cloud-asset/src/v1/asset_service_client_config.json

+15-6
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,48 @@
2121
},
2222
"methods": {
2323
"ExportAssets": {
24+
"timeout_millis": 60000,
2425
"retry_codes_name": "non_idempotent",
2526
"retry_params_name": "default"
2627
},
2728
"BatchGetAssetsHistory": {
28-
"retry_codes_name": "non_idempotent",
29+
"timeout_millis": 60000,
30+
"retry_codes_name": "idempotent",
2931
"retry_params_name": "default"
3032
},
3133
"CreateFeed": {
34+
"timeout_millis": 60000,
3235
"retry_codes_name": "non_idempotent",
3336
"retry_params_name": "default"
3437
},
3538
"GetFeed": {
36-
"retry_codes_name": "non_idempotent",
39+
"timeout_millis": 60000,
40+
"retry_codes_name": "idempotent",
3741
"retry_params_name": "default"
3842
},
3943
"ListFeeds": {
40-
"retry_codes_name": "non_idempotent",
44+
"timeout_millis": 60000,
45+
"retry_codes_name": "idempotent",
4146
"retry_params_name": "default"
4247
},
4348
"UpdateFeed": {
49+
"timeout_millis": 60000,
4450
"retry_codes_name": "non_idempotent",
4551
"retry_params_name": "default"
4652
},
4753
"DeleteFeed": {
48-
"retry_codes_name": "non_idempotent",
54+
"timeout_millis": 60000,
55+
"retry_codes_name": "idempotent",
4956
"retry_params_name": "default"
5057
},
5158
"SearchAllResources": {
52-
"retry_codes_name": "non_idempotent",
59+
"timeout_millis": 15000,
60+
"retry_codes_name": "idempotent",
5361
"retry_params_name": "default"
5462
},
5563
"SearchAllIamPolicies": {
56-
"retry_codes_name": "non_idempotent",
64+
"timeout_millis": 15000,
65+
"retry_codes_name": "idempotent",
5766
"retry_params_name": "default"
5867
}
5968
}

‎packages/google-cloud-asset/src/v1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1/assets.proto"
94
]

‎packages/google-cloud-asset/src/v1beta1/asset_service_client_config.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
},
2222
"methods": {
2323
"ExportAssets": {
24+
"timeout_millis": 60000,
2425
"retry_codes_name": "non_idempotent",
2526
"retry_params_name": "default"
2627
},
2728
"BatchGetAssetsHistory": {
28-
"retry_codes_name": "non_idempotent",
29+
"timeout_millis": 60000,
30+
"retry_codes_name": "idempotent",
2931
"retry_params_name": "default"
3032
}
3133
}

‎packages/google-cloud-asset/src/v1beta1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1beta1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1beta1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1beta1/assets.proto"
94
]

‎packages/google-cloud-asset/src/v1p1beta1/asset_service_client_config.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
},
2222
"methods": {
2323
"SearchAllResources": {
24-
"retry_codes_name": "non_idempotent",
24+
"timeout_millis": 15000,
25+
"retry_codes_name": "idempotent",
2526
"retry_params_name": "default"
2627
},
2728
"SearchAllIamPolicies": {
28-
"retry_codes_name": "non_idempotent",
29+
"timeout_millis": 15000,
30+
"retry_codes_name": "idempotent",
2931
"retry_params_name": "default"
3032
}
3133
}

‎packages/google-cloud-asset/src/v1p1beta1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1p1beta1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1p1beta1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1p1beta1/assets.proto"
94
]

‎packages/google-cloud-asset/src/v1p2beta1/asset_service_client_config.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,28 @@
2121
},
2222
"methods": {
2323
"CreateFeed": {
24+
"timeout_millis": 60000,
2425
"retry_codes_name": "non_idempotent",
2526
"retry_params_name": "default"
2627
},
2728
"GetFeed": {
28-
"retry_codes_name": "non_idempotent",
29+
"timeout_millis": 60000,
30+
"retry_codes_name": "idempotent",
2931
"retry_params_name": "default"
3032
},
3133
"ListFeeds": {
32-
"retry_codes_name": "non_idempotent",
34+
"timeout_millis": 60000,
35+
"retry_codes_name": "idempotent",
3336
"retry_params_name": "default"
3437
},
3538
"UpdateFeed": {
39+
"timeout_millis": 60000,
3640
"retry_codes_name": "non_idempotent",
3741
"retry_params_name": "default"
3842
},
3943
"DeleteFeed": {
40-
"retry_codes_name": "non_idempotent",
44+
"timeout_millis": 60000,
45+
"retry_codes_name": "idempotent",
4146
"retry_params_name": "default"
4247
}
4348
}

‎packages/google-cloud-asset/src/v1p2beta1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1p2beta1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1p2beta1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1p2beta1/assets.proto"
94
]

‎packages/google-cloud-asset/src/v1p4beta1/asset_service_client_config.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"idempotent": [
77
"DEADLINE_EXCEEDED",
88
"UNAVAILABLE"
9+
],
10+
"unavailable": [
11+
"UNAVAILABLE"
912
]
1013
},
1114
"retry_params": {
@@ -21,10 +24,12 @@
2124
},
2225
"methods": {
2326
"AnalyzeIamPolicy": {
24-
"retry_codes_name": "non_idempotent",
27+
"timeout_millis": 300000,
28+
"retry_codes_name": "unavailable",
2529
"retry_params_name": "default"
2630
},
2731
"ExportIamPolicyAnalysis": {
32+
"timeout_millis": 60000,
2833
"retry_codes_name": "non_idempotent",
2934
"retry_params_name": "default"
3035
}

‎packages/google-cloud-asset/src/v1p4beta1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1p4beta1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1p4beta1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1p4beta1/assets.proto"
94
]

‎packages/google-cloud-asset/src/v1p5beta1/asset_service_proto_list.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
22
"../../protos/google/cloud/asset/v1p5beta1/asset_service.proto",
3-
"../../protos/google/cloud/asset/v1p5beta1/assets.proto",
4-
"../../protos/google/cloud/orgpolicy/v1/orgpolicy.proto",
5-
"../../protos/google/identity/accesscontextmanager/type/device_resources.proto",
6-
"../../protos/google/identity/accesscontextmanager/v1/access_level.proto",
7-
"../../protos/google/identity/accesscontextmanager/v1/access_policy.proto",
8-
"../../protos/google/identity/accesscontextmanager/v1/service_perimeter.proto"
3+
"../../protos/google/cloud/asset/v1p5beta1/assets.proto"
94
]

‎packages/google-cloud-asset/synth.metadata

+22-22
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
{
44
"git": {
55
"name": ".",
6-
"remote": "https://github.com/googleapis/nodejs-asset.git",
7-
"sha": "495f9ed3bea66db2f340db6b9566bf9c34cb7935"
6+
"remote": "git@github.com:googleapis/nodejs-asset.git",
7+
"sha": "1c34573510622fa114248f4f1682d910ef738905"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "7c577e89f1c84545113b393b7d7964473251d123",
15-
"internalRef": "318542700"
14+
"sha": "b085d0af47a9addead321737ebde7448fd179a51",
15+
"internalRef": "319801234"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "synthtool",
2121
"remote": "https://github.com/googleapis/synthtool.git",
22-
"sha": "dc9caca650c77b7039e2bbc3339ffb34ae78e5b7"
22+
"sha": "303271797a360f8a439203413f13a160f2f5b3b4"
2323
}
2424
}
2525
],
@@ -29,53 +29,53 @@
2929
"source": "googleapis",
3030
"apiName": "asset",
3131
"apiVersion": "v1beta1",
32-
"language": "typescript",
33-
"generator": "gapic-generator-typescript"
32+
"language": "nodejs",
33+
"generator": "bazel"
3434
}
3535
},
3636
{
3737
"client": {
3838
"source": "googleapis",
3939
"apiName": "asset",
40-
"apiVersion": "v1",
41-
"language": "typescript",
42-
"generator": "gapic-generator-typescript"
40+
"apiVersion": "v1p1beta1",
41+
"language": "nodejs",
42+
"generator": "bazel"
4343
}
4444
},
4545
{
4646
"client": {
4747
"source": "googleapis",
4848
"apiName": "asset",
49-
"apiVersion": "v1p1beta1",
50-
"language": "typescript",
51-
"generator": "gapic-generator-typescript"
49+
"apiVersion": "v1p2beta1",
50+
"language": "nodejs",
51+
"generator": "bazel"
5252
}
5353
},
5454
{
5555
"client": {
5656
"source": "googleapis",
5757
"apiName": "asset",
58-
"apiVersion": "v1p2beta1",
59-
"language": "typescript",
60-
"generator": "gapic-generator-typescript"
58+
"apiVersion": "v1p4beta1",
59+
"language": "nodejs",
60+
"generator": "bazel"
6161
}
6262
},
6363
{
6464
"client": {
6565
"source": "googleapis",
6666
"apiName": "asset",
67-
"apiVersion": "v1p4beta1",
68-
"language": "typescript",
69-
"generator": "gapic-generator-typescript"
67+
"apiVersion": "v1p5beta1",
68+
"language": "nodejs",
69+
"generator": "bazel"
7070
}
7171
},
7272
{
7373
"client": {
7474
"source": "googleapis",
7575
"apiName": "asset",
76-
"apiVersion": "v1p5beta1",
77-
"language": "typescript",
78-
"generator": "gapic-generator-typescript"
76+
"apiVersion": "v1",
77+
"language": "nodejs",
78+
"generator": "bazel"
7979
}
8080
}
8181
]

‎packages/google-cloud-asset/synth.py

+4-15
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,15 @@
2424
AUTOSYNTH_MULTIPLE_COMMITS = True
2525

2626

27-
gapic = gcp.GAPICMicrogenerator()
28-
versions = ['v1beta1', 'v1', 'v1p1beta1', 'v1p2beta1', 'v1p4beta1', 'v1p5beta1']
27+
gapic = gcp.GAPICBazel()
28+
versions = ['v1beta1', 'v1p1beta1', 'v1p2beta1', 'v1p4beta1', 'v1p5beta1', 'v1']
2929
name = 'asset'
3030
for version in versions:
31-
library = gapic.typescript_library(
32-
name,
33-
proto_path=f'google/cloud/{name}/{version}',
34-
generator_args={
35-
'grpc-service-config': f'google/cloud/{name}/{version}/cloud{name}_grpc_service_config.json',
36-
'package-name': f'@google-cloud/{name}'
37-
},
38-
# This API has dependencies outside of its own folder so we list them here.
39-
# Switching to bazel build should help get rid of this.
40-
extra_proto_files=['google/cloud/common_resources.proto',
41-
'google/cloud/orgpolicy/v1', 'google/identity/accesscontextmanager'],
42-
version=version),
31+
library = gapic.node_library(name, version)
4332
# skip index, protos, package.json, and README.md
4433
s.copy(
4534
library,
46-
excludes=['package.json']
35+
excludes=['package.json', 'README.md']
4736
)
4837

4938
# Copy common templates

0 commit comments

Comments
 (0)