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.

Sign up for GitHub

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

Jump to bottom

feat: add v1beta2 of secretmanager #10577

Merged
merged 7 commits into from
Mar 21, 2024
Merged

feat: add v1beta2 of secretmanager #10577

merged 7 commits into from
Mar 21, 2024

Conversation

diegomarquezp
Copy link
Contributor

No description provided.

@diegomarquezp diegomarquezp requested a review from a team as a code owner March 19, 2024 21:06
@diegomarquezp
Copy link
Contributor Author

@JoeWang1127 I see that the config yaml does not have v1beta1,

google-cloud-java/generation_config.yaml

Lines 1531 to 1539 in 80495ad

- api_shortname: secretmanager
name_pretty: Secret Management
product_documentation: https://cloud.google.com/solutions/secrets-management/
api_description: allows you to encrypt, store, manage, and audit infrastructure
and application-level secrets.
release_level: stable
requires_billing: false
GAPICs:
- proto_path: google/cloud/secretmanager/v1

but there is a proto folder in the library:
image

Was this library recently removed?

@JoeWang1127
Copy link
Contributor

v1beta1 is removed from googleapis, so we should remove it from google-cloud-java.

v1beta2 is added in this commit

@diegomarquezp
Copy link
Contributor Author

v1beta1 is removed from googleapis, so we should remove it from google-cloud-java.

v1beta2 is added in this commit

Gotcha, thanks for checking. I'll follow up with removing v1beta1 from the monorepo.

@blakeli0
Copy link
Contributor

v1beta1 is removed from googleapis, so we should remove it from google-cloud-java.
v1beta2 is added in this commit

Gotcha, thanks for checking. I'll follow up with removing v1beta1 from the monorepo.

Is this(removal of a GAPIC version) something our scripts can handle automatically in the future?

@blakeli0
Copy link
Contributor

It should probably be handled by @JoeWang1127 's upcoming scripts, for now, can you manually run the generation script and add the changes as part of this PR?

@diegomarquezp
Copy link
Contributor Author

diegomarquezp commented Mar 20, 2024 •
edited
Loading

v1beta1 is removed from googleapis, so we should remove it from google-cloud-java.
v1beta2 is added in this commit

Gotcha, thanks for checking. I'll follow up with removing v1beta1 from the monorepo.

Is this(removal of a GAPIC version) something our scripts can handle automatically in the future?

@blakeli0 the deep-remove regex is meant to reset the source folders before transferring the generated files, so they should be removed with a default-generated owlbot yaml. However, these v1beta1 folders are being explicitly preserved:

google-cloud-java/java-secretmanager/.OwlBot.yaml

Lines 22 to 27 in 0416bfb

deep-preserve-regex:
- "/java-secretmanager/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
- "/java-secretmanager/proto-google-cloud-secretmanager-v1beta1"
- "/java-secretmanager/grpc-google-cloud-secretmanager-v1beta1"
- "/java-secretmanager/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1"
- "/java-secretmanager/google-cloud-secretmanager/src/test/java/com/google/cloud/secretmanager/v1beta1"

Do we want to remove this preserve regex?

@snippet-bot Snippet Bot
Copy link

snippet-bot bot commented Mar 20, 2024 •
edited
Loading

Here is the summary of changes.

You are about to add 67 region tags.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

diegomarquezp
diegomarquezp commented Mar 20, 2024
View reviewed changes
java-secretmanager/.OwlBot.yaml
Copy link
Contributor Author

@diegomarquezp diegomarquezp Mar 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should probably be handled by @JoeWang1127 's upcoming scripts, for now, can you manually run the generation script and add the changes as part of this PR?

@blakeli0 the generation went well after a small tweak to the owlbot yaml. This is something we need to add to the release notes.

Edit: added

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is another point in favor of normalizing the owlbot yaml regexes

@blakeli0
Copy link
Contributor

v1beta1 is removed from googleapis, so we should remove it from google-cloud-java.
v1beta2 is added in this commit

Gotcha, thanks for checking. I'll follow up with removing v1beta1 from the monorepo.

Is this(removal of a GAPIC version) something our scripts can handle automatically in the future?

@blakeli0 the deep-remove regex is meant to reset the source folders before transferring the generated files, so they should be removed with a default-generated owlbot yaml. However, these v1beta1 folders are being explicitly preserved:

google-cloud-java/java-secretmanager/.OwlBot.yaml

Lines 22 to 27 in 0416bfb

deep-preserve-regex:
- "/java-secretmanager/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
- "/java-secretmanager/proto-google-cloud-secretmanager-v1beta1"
- "/java-secretmanager/grpc-google-cloud-secretmanager-v1beta1"
- "/java-secretmanager/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1"
- "/java-secretmanager/google-cloud-secretmanager/src/test/java/com/google/cloud/secretmanager/v1beta1"

Do we want to remove this preserve regex?

SGTM.

@diegomarquezp
Copy link
Contributor Author

diegomarquezp commented Mar 20, 2024 •
edited
Loading

@blakeli0 Looks like the deep-remove regexes only delete part of the proto and grpc libraries.

google-cloud-java/java-secretmanager/.OwlBot.yaml

Lines 18 to 19 in d61155f

- "/java-secretmanager/grpc-google-.*/src"
- "/java-secretmanager/proto-google-.*/src"

I will add a commit to manually remove the v1beta1 libraries. This confirms that it's not enough with simply removing an api version from generation_config.yaml

@diegomarquezp diegomarquezp merged commit b87dd72 into main Mar 21, 2024
30 of 31 checks passed
@diegomarquezp diegomarquezp deleted the v1beta2-for-secretmanager branch March 21, 2024 15:37
@release-please release-please bot mentioned this pull request Mar 21, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoeWang1127 JoeWang1127 JoeWang1127 approved these changes

@blakeli0 blakeli0 blakeli0 approved these changes

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
@diegomarquezp @JoeWang1127 @blakeli0