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

cloud/azure: Fix azure schemes #111217

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Conversation

benbardin
Copy link
Collaborator

Part of: https://cockroachlabs.atlassian.net/browse/CRDB-31120

Release note (bug fix): Fixes azure schemes in storage, kms and external conns.

@benbardin benbardin added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Sep 25, 2023
@benbardin benbardin requested a review from a team as a code owner September 25, 2023 16:34
@blathers-crl
Copy link

blathers-crl bot commented Sep 25, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@adityamaru
Copy link
Contributor

The change LGTM but I think we should add a few tests so that if this breaks in the future we have something that fails?

Copy link
Contributor

@adityamaru adityamaru left a comment

Choose a reason for hiding this comment

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

Thanks for picking this up, as discussed offline it'd be useful to either add a few lines to the integration tests or just smoke test e2e since CDC also registers azure schemes but with their own custom validator.

@benbardin
Copy link
Collaborator Author

Done, how's this look?

Copy link
Contributor

@adityamaru adityamaru left a comment

Choose a reason for hiding this comment

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

🚀

Part of: https://cockroachlabs.atlassian.net/browse/CRDB-31120

Release note (bug fix): Fixes azure schemes in storage, kms and external conns.
@benbardin
Copy link
Collaborator Author

bors r+

@craig craig bot merged commit 46cb4e3 into cockroachdb:master Sep 25, 2023
3 checks passed
@craig
Copy link
Contributor

craig bot commented Sep 25, 2023

Build succeeded:

@blathers-crl
Copy link

blathers-crl bot commented Sep 25, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 5cd4c7b to blathers/backport-release-22.2-111217: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@adityamaru
Copy link
Contributor

@benbardin apologies I should've pointed this out earlier. @mdlinville indicated that it would help to flesh out the release note so that the appropriate changes can be made in the docs across releases.

craig bot pushed a commit that referenced this pull request Sep 27, 2023
111286: release-22.2: cloud/azure: Fix azure schemes r=benbardin a=benbardin

Backport 1/1 commits from #111217.

/cc `@cockroachdb/release`

---

Part of: https://cockroachlabs.atlassian.net/browse/CRDB-31120

Release note (bug fix): Fixes azure schemes in storage and external conns.

Release justification: bugfix


Co-authored-by: Ben Bardin <bardin@cockroachlabs.com>
@mdlinville
Copy link
Contributor

@benbardin apologies I should've pointed this out earlier. @mdlinville indicated that it would help to flesh out the release note so that the appropriate changes can be made in the docs across releases.

We synced offline and came up with a good release note. :)

@benbardin
Copy link
Collaborator Author

Yes, thanks Matt! I also added appropriate variants of the notes to the backported versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants