Skip to content

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

Merged
suztomo merged 8 commits into
mainfrom
revert-8337-remove_owl-bot-staging
Sep 19, 2022
Merged

fix: revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versions#8340
suztomo merged 8 commits into
mainfrom
revert-8337-remove_owl-bot-staging

Conversation

@suztomo

@suztomosuztomo commented Sep 9, 2022•
edited
Loading

Copy link
Copy Markdown
Member

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.

@suztomosuztomo added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@gcf-owl-botgcf-owl-botBot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@suztomosuztomo changed the title Revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versionsfix: revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versionsSep 9, 2022
@suztomo

suztomo commented Sep 9, 2022

Copy link
Copy Markdown
MemberAuthor

GitHub said OwlBot PostProcessor failed

Screen Shot 2022-09-09 at 2 24 05 PM

But the build is still running.

https://pantheon.corp.google.com/cloud-build/builds;region=global/ad6c4072-86dd-46af-985b-f2f65dbe27d5?project=repo-automation-bots&jsmode=O&mods=logs_tg_staging

@suztomo

suztomo commented Sep 9, 2022

Copy link
Copy Markdown
MemberAuthor

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.

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

suztomo commented Sep 9, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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.

@suztomosuztomo added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@gcf-owl-botgcf-owl-botBot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 9, 2022
@suztomo

suztomo commented Sep 9, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

@suztomosuztomo mentioned this pull request Sep 16, 2022
Closed
@suztomo

suztomo commented Sep 16, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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.

@suztomosuztomo mentioned this pull request Sep 16, 2022
Merged
@suztomosuztomo added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 16, 2022
@yoshi-kokoroyoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 16, 2022
@suztomo

suztomo commented Sep 17, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor
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

@suztomosuztomo added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 17, 2022
@yoshi-kokoroyoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 17, 2022
@suztomo

suztomo commented Sep 19, 2022

Copy link
Copy Markdown
MemberAuthor

All checks green.

@suztomo
suztomo merged commit dedef71 into mainSep 19, 2022
@suztomo
suztomo deleted the revert-8337-remove_owl-bot-staging branch September 19, 2022 13:50
@suztomosuztomo mentioned this pull request Sep 19, 2022
Merged
1 task
@release-pleaserelease-pleaseBot mentioned this pull request Sep 23, 2022
Closed
This was referenced Sep 27, 2022
Closed
Closed
Closed
Closed
@release-pleaserelease-pleaseBot mentioned this pull request Oct 3, 2022
Closed
suztomo added a commit to suztomo/google-cloud-java that referenced this pull request Oct 4, 2022
@suztomo@gcf-owl-bot
fix: revert reverting [Many APIs] Update WORKSPACE files for rules_ga…
60a4fbd
…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
Closed
Merged
@release-pleaserelease-pleaseBot mentioned this pull request Nov 10, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@meltsufinmeltsufinmeltsufin approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@suztomo@meltsufin@yoshi-kokoro