This repository has been archived by the owner on Sep 16, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: migrate to owlbot * Update pom.xml * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
- Loading branch information
1 parent
9013953
commit f389b84
Showing
9 changed files
with
127 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| docker: | ||
| digest: sha256:4e961d006ec9e44501273788f3cbe1e060c4666742ba190f60d6a05bcdf3ac8f | ||
| image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Copyright 2021 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| docker: | ||
| image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" | ||
| deep-remove-regex: | ||
| - "/grpc-google-cloud-containeranalysis-v1/src" | ||
| - "/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1" | ||
| - "/proto-google-cloud-containeranalysis-v1/src" | ||
|
|
||
| # TODO: remove resource name classes in next major update | ||
| deep-preserve-regex: | ||
| - "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" | ||
| - "/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1beta1" | ||
| - "/proto-google-cloud-containeranalysis-v.*/src/main/java/com/google/containeranalysis/v.*/.*Name.*.java" | ||
| - "/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java" | ||
| - "/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java" | ||
|
|
||
| deep-copy-regex: | ||
| - source: "/google/devtools/containeranalysis/v1/.*-java/proto-google-.*/src" | ||
| dest: "/owl-bot-staging/v1/proto-google-cloud-containeranalysis-v1/src" | ||
| - source: "/google/devtools/containeranalysis/v1/.*-java/grpc-google-.*/src" | ||
| dest: "/owl-bot-staging/v1/grpc-google-cloud-containeranalysis-v1/src" | ||
| - source: "/google/devtools/containeranalysis/v1/.*-java/gapic-google-.*/src" | ||
| dest: "/owl-bot-staging/v1/google-cloud-containeranalysis/src" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # Copyright 2021 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import synthtool as s | ||
| from synthtool.languages import java | ||
|
|
||
| get_grafeas_code = """ | ||
| /** | ||
| * Returns a new GrafeasClient with the same configured settings. | ||
| * | ||
| * @throws IOException | ||
| */ | ||
| public GrafeasClient getGrafeasClient() throws IOException { | ||
| return GrafeasClient.create(GrafeasUtils.transformSettings(settings)); | ||
| } | ||
| """ | ||
|
|
||
| for library in s.get_staging_dirs(): | ||
| # put any special-case replacements here | ||
| s.replace( | ||
| f'owl-bot-staging/v1/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java', | ||
| 'import com.google.iam.v1.TestIamPermissionsResponse;', | ||
| 'import com.google.iam.v1.TestIamPermissionsResponse;\nimport io.grafeas.v1.GrafeasClient;' | ||
| ) | ||
|
|
||
| # add getGrafeasClient() | ||
| s.replace( | ||
| f'owl-bot-staging/v1/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java', | ||
| r'(\s+private final ContainerAnalysisStub stub;.*)', | ||
| f'\g<1>{get_grafeas_code}' | ||
| ) | ||
| s.move(library) | ||
|
|
||
| s.remove_staging_dirs() | ||
| java.common_templates() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
proto-google-cloud-containeranalysis-v1/clirr-ignored-differences.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html --> | ||
| <differences> | ||
| <difference> | ||
| <differenceType>7012</differenceType> | ||
| <className>com/google/containeranalysis/v1/*OrBuilder</className> | ||
| <method>* get*(*)</method> | ||
| </difference> | ||
| <difference> | ||
| <differenceType>7012</differenceType> | ||
| <className>com/google/containeranalysis/v1/*OrBuilder</className> | ||
| <method>boolean contains*(*)</method> | ||
| </difference> | ||
| <difference> | ||
| <differenceType>7012</differenceType> | ||
| <className>com/google/containeranalysis/v1/*OrBuilder</className> | ||
| <method>boolean has*(*)</method> | ||
| </difference> | ||
| </differences> |