Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versions #8340

Merged
merged 8 commits into from
Sep 19, 2022

Conversation

suztomo
Copy link
Member

@suztomo suztomo commented Sep 9, 2022

Reverts #8337, which reverted #8305. 8305 was merged without OwlBot Java Postprocessor (owl-bot-staging directory). We should merged the change after processing OwlBot Java PostProcessor.

The idea is that OwlBot Java PostProcessor should process the content of owl-bot-staging if we wait. No need to have OwlBot service to re-create the pull request.

@suztomo suztomo added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@suztomo suztomo changed the title Revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versions fix: revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versions Sep 9, 2022
@suztomo
Copy link
Member Author

suztomo commented Sep 9, 2022

@suztomo
Copy link
Member Author

suztomo commented Sep 9, 2022

It died with 80 minutes timeout

Screen Shot 2022-09-09 at 4 12 36 PM

Step #8: e9828dff6efe: Pull complete
Step #8: Digest: sha256:f18997e574d4544becdcee35cef3f23ebef78d8e2e3a982306106313dea50aed
Step #8: Status: Downloaded newer image for gcr.io/cloud-devrel-public-resources/owlbot-cli:latest
Step #8: gcr.io/cloud-devrel-public-resources/owlbot-cli:latest
Step #8: git add -A .
TIMEOUT
ERROR: context deadline exceeded

It was very close.

docker run --rm -v $(pwd):/workspace -w /workspace --user $(id -u):$(id -g) gcr.io/cloud-devrel-public-resources/owlbot-java
@suztomo suztomo added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@suztomo
Copy link
Member Author

suztomo commented Sep 9, 2022

I ran owlbot-java manually:

docker run --rm -v $(pwd):/workspace -w /workspace --user $(id -u):$(id -g) gcr.io/cloud-devrel-public-resources/owlbot-java

It seems working.

@suztomo suztomo added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@suztomo
Copy link
Member Author

suztomo commented Sep 9, 2022

I think it's waiting for a new shared dependencies BOM.

Error: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.10.1:compile (default-compile) on project google-analytics-data: Compilation failure: Compilation failure: Error: /home/runner/work/google-cloud-java/google-cloud-java/java-analytics-data/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/HttpJsonBetaAnalyticsDataStub.java:[92,35] method toBody in class com.google.api.gax.httpjson.ProtoRestSerializer<RequestT> cannot be applied to given types; Error: required: java.lang.String,com.google.protobuf.Message Error: found: java.lang.String,com.google.analytics.data.v1beta.RunReportRequest,boolean Error: reason: actual and formal argument lists differ in length

@suztomo
Copy link
Member Author

suztomo commented Sep 16, 2022

Screen Shot 2022-09-16 at 12 35 56 PM

The google-data-analytics module is not referencing java-analytics module's pom.xml in this repository, because the version is different. It now references the artifact in Maven Central, which references an old GAX version.

@suztomo suztomo added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 16, 2022
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 16, 2022
@suztomo
Copy link
Member Author

suztomo commented Sep 17, 2022

Error:  Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.10.1:compile (default-compile) on project proto-google-cloud-websecurityscanner-v1: Compilation failure: Compilation failure: 
Error:  /home/runner/work/google-cloud-java/google-cloud-java/java-websecurityscanner/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Xxe.java:[111,9] cannot find symbol
Error:    symbol:   variable internal_static_google_cloud_websecurityscanner_v1_Xxe_descriptor
Error:    location: class com.google.cloud.websecurityscanner.v1.FindingAddonProto
Error:  /home/runner/work/google-cloud-java/google-cloud-java/java-websecurityscanner/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Xxe.java:[118,9] cannot find symbol
Error:    symbol:   variable internal_static_google_cloud_websecurityscanner_v1_Xxe_fieldAccessorTable
Error:    location: class com.google.cloud.websecurityscanner.v1.FindingAddonProto
Error:  /home/runner/work/google-cloud-java/google-cloud-java/java-websecurityscanner/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Xxe.java:[533,11] cannot find symbol
Error:    symbol:   variable internal_static_google_cloud_websecurityscanner_v1_Xxe_descriptor
Error:    location: class com.google.cloud.websecurityscanner.v1.FindingAddonProto
Error:  /home/runner/work/google-cloud-java/google-cloud-java/java-websecurityscanner/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Xxe.java:[540,11] cannot find symbol
Error:    symbol:   variable internal_static_google_cloud_websecurityscanner_v1_Xxe_fieldAccessorTable
Error:    location: class com.google.cloud.websecurityscanner.v1.FindingAddonProto
Error:  /home/runner/work/google-cloud-java/google-cloud-java/java-websecurityscanner/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Xxe.java:[573,11] cannot find symbol
Error:    symbol:   variable internal_static_google_cloud_websecurityscanner_v1_Xxe_descriptor
Error:    location: class com.google.cloud.websecurityscanner.v1.FindingAddonProto

The Xxe.java does not exist in the split repo yet. https://github.com/googleapis/java-websecurityscanner/pull/741/files#diff-3d6f33fcbec6e90a00dbdb58f08e676785b42d9b946fc9d08016a0c8d2e31e21 (not merged yet; 2 CL changes) is adding the class to the repository.

Screen Shot 2022-09-16 at 11 00 20 PM

@suztomo suztomo added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 17, 2022
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 17, 2022
@suztomo
Copy link
Member Author

suztomo commented Sep 19, 2022

All checks green.

@suztomo suztomo merged commit dedef71 into main Sep 19, 2022
@suztomo suztomo deleted the revert-8337-remove_owl-bot-staging branch September 19, 2022 13:50
@release-please release-please bot mentioned this pull request Sep 23, 2022
suztomo added a commit to suztomo/google-cloud-java that referenced this pull request Oct 4, 2022
…pic, gax_java, generator_java versions (googleapis#8340)

* Revert "fix: owl-bot-staging should not be commited (googleapis#8337)"

This reverts commit c9bb4a9.

* owlbot-java postprocessor

docker run --rm -v $(pwd):/workspace -w /workspace --user $(id -u):$(id -g) gcr.io/cloud-devrel-public-resources/owlbot-java

* manual fix

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* use shared dep bom without property

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
This was referenced Oct 14, 2022
@release-please release-please bot mentioned this pull request Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants