-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
feat!: Update containeranalysis v1beta1 with the latest protos #11155
base: main
Are you sure you want to change the base?
Conversation
…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 <diegomarquezp@google.com>
# 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, removed the non-existent resouce names.
- 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you refactor this part to remove the version, just like this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: could you also refactor this part as well, like
google-cloud-java/java-errorreporting/.OwlBot-hermetic.yaml
Lines 16 to 20 in 8cac6d6
deep-remove-regex: | |
- "/java-errorreporting/grpc-google-.*/src" | |
- "/java-errorreporting/proto-google-.*/src" | |
- "/java-errorreporting/google-.*/src" | |
- "/java-errorreporting/samples/snippets/generated" |
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.