Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
chore: Migrate tasks synth.py to bazel (#101)
Browse files Browse the repository at this point in the history
The changes in grpc stubs are caused by the gRPC upgrade from 1.10 (more than a year old) to 1.27 (same version which is used as runtime dependency).

The shell scripts chagnes are not related to bazel change.
  • Loading branch information
vam-google committed Mar 26, 2020
1 parent f330679 commit acc082a
Show file tree
Hide file tree
Showing 8 changed files with 760 additions and 1,329 deletions.
10 changes: 10 additions & 0 deletions grpc-google-cloud-tasks-v2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<!-- TODO: remove after 1.28.3 released -->
<differenceType>6001</differenceType>
<className>com/google/cloud/tasks/v2/*Grpc</className>
<field>METHOD_*</field>
</difference>
</differences>

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions grpc-google-cloud-tasks-v2beta2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<!-- TODO: remove after 1.28.3 released -->
<differenceType>6001</differenceType>
<className>com/google/cloud/tasks/v2beta2/*Grpc</className>
<field>METHOD_*</field>
</difference>
</differences>

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions grpc-google-cloud-tasks-v2beta3/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<!-- TODO: remove after 1.28.3 released -->
<differenceType>6001</differenceType>
<className>com/google/cloud/tasks/v2beta3/*Grpc</className>
<field>METHOD_*</field>
</difference>
</differences>

Large diffs are not rendered by default.

16 changes: 3 additions & 13 deletions synth.metadata
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
{
"updateTime": "2020-03-25T19:06:04.782527Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "1.1.1",
"dockerImage": "googleapis/artman@sha256:5ef340c8d9334719bc5c6981d95f4a5d2737b0a6a24f2b9a0d430e96fff85c5b"
}
},
{
"git": {
"name": "googleapis",
Expand All @@ -33,8 +26,7 @@
"apiName": "tasks",
"apiVersion": "v2beta2",
"language": "java",
"generator": "gapic",
"config": "google/cloud/tasks/artman_cloudtasks_v2beta2.yaml"
"generator": "bazel"
}
},
{
Expand All @@ -43,8 +35,7 @@
"apiName": "tasks",
"apiVersion": "v2beta3",
"language": "java",
"generator": "gapic",
"config": "google/cloud/tasks/artman_cloudtasks_v2beta3.yaml"
"generator": "bazel"
}
},
{
Expand All @@ -53,8 +44,7 @@
"apiName": "tasks",
"apiVersion": "v2",
"language": "java",
"generator": "gapic",
"config": "google/cloud/tasks/artman_cloudtasks_v2.yaml"
"generator": "bazel"
}
}
]
Expand Down
24 changes: 13 additions & 11 deletions synth.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

AUTOSYNTH_MULTIPLE_COMMITS = True

gapic = gcp.GAPICGenerator()
gapic = gcp.GAPICBazel()

service = 'tasks'
versions = ['v2beta2', 'v2beta3', 'v2']
Expand Down Expand Up @@ -52,32 +52,34 @@
library = gapic.java_library(
service=service,
version=version,
config_path=config_pattern.format(version=version),
artman_output_name='')
bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java',
)

library = library / f"google-cloud-{service}-{version}-java"

package_name = f'com.google.cloud.{service}.{version}'
java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}')
java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name)
java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}-java')
java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}-java', package_name)

s.replace(
library / f'gapic-google-cloud-{service}-{version}/src/**/CloudTasksClient.java',
library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java',
GET_IAM_POLICY_PREVIOUS,
"\g<1>\n\n" + GET_IAM_POLICY
)
s.replace(
library / f'gapic-google-cloud-{service}-{version}/src/**/CloudTasksClient.java',
library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java',
SET_IAM_POLICY_PREVIOUS,
"\g<1>\n\n" + SET_IAM_POLICY
)
s.replace(
library / f'gapic-google-cloud-{service}-{version}/src/**/CloudTasksClient.java',
library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java',
TEST_IAM_POLICY_PREVIOUS,
"\g<1>\n\n" + TEST_IAM_POLICY
)

s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-{service}/src')
s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src')
s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', f'google-cloud-{service}/src')
s.copy(library / f'grpc-google-cloud-{service}-{version}-java/src', f'grpc-google-cloud-{service}-{version}/src')
s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src')

java.format_code(f'google-cloud-{service}/src')
java.format_code(f'grpc-google-cloud-{service}-{version}/src')
Expand Down

0 comments on commit acc082a

Please sign in to comment.