feat!: Update containeranalysis v1beta1 with the latest protos #11155
+20,731
−30,581
Conversation
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
blakeli0
added a commit
to googleapis/sdk-platform-java
that referenced
this pull request
Sep 19, 2024
…3213) The protoc generated files for cvss.proto are outdated for containeranalysis, we are going to update them in googleapis/google-cloud-java#11155. This cvss.proto was exclude before because the whole [v1beta1 version](https://github.com/googleapis/google-cloud-java/blob/main/java-containeranalysis/.OwlBot-hermetic.yaml#L30-L36) was not configured to be updated. Co-authored-by: Diego Marquez <[email protected]>
blakeli0
changed the title
lqiu96
reviewed
Sep 20, 2024
| # TODO: remove resource name classes in next major update | ||
|
|
||
| deep-preserve-regex: | ||
| - "/java-containeranalysis/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" | ||
| - "/java-containeranalysis/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1beta1" | ||
| - "/java-containeranalysis/proto-google-cloud-containeranalysis-v.*/src/main/java/com/google/containeranalysis/v.*/.*Name.*.java" |
There was a problem hiding this comment.
The resource names are also generated based on the proto files. Do you think we can also remove these from being preserved and update them to the latest as part of the feat! PR?
There was a problem hiding this comment.
Yes, removed the non-existent resouce names.
JoeWang1127
reviewed
Sep 20, 2024
| - source: "/google/devtools/containeranalysis/v1beta1/.*-java/grpc-google-.*/src" | ||
| dest: "/owl-bot-staging/java-containeranalysis/v1beta1/grpc-google-cloud-containeranalysis-v1beta1/src" | ||
| - source: "/google/devtools/containeranalysis/v1beta1/.*-java/gapic-google-.*/src" | ||
| dest: "/owl-bot-staging/java-containeranalysis/v1beta1/google-cloud-containeranalysis/src" |
There was a problem hiding this comment.
Could you refactor this part to remove the version, just like this
JoeWang1127
reviewed
Sep 20, 2024
| @@ -18,21 +18,20 @@ deep-remove-regex: | |||
| - "/java-containeranalysis/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1" | |||
| - "/java-containeranalysis/samples/snippets/generated" | |||
| - "/java-containeranalysis/proto-google-cloud-containeranalysis-v1/src" | |||
| - "/java-containeranalysis/proto-google-cloud-containeranalysis-v1beta1/src" | |||
There was a problem hiding this comment.
nit: could you also refactor this part as well, like
google-cloud-java/java-errorreporting/.OwlBot-hermetic.yaml
Lines 16 to 20 in 8cac6d6
JoeWang1127
approved these changes
Sep 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are some protoc generated files in containeranalysis v1beta1 are not updated in 5 years, which make them not compatible with the latest protobuf-runtime anymore. Regenerate them with protoc 3.25.4 and the latest proto definitions. Note that some proto messages were removed, hence this is technically a breaking change.
See go/incompatible-protoc-files-java-sdk for more details.