Skip to content

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #30748 to be assessed for backporting due to the inclusion of the label backport/1.19.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@ryancragun
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


This PR was generated by a GitHub Action. Full log: https://github.com/hashicorp/vault/actions/runs/15218145666


Overview of commits

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label May 23, 2025
Copy link

CI Results:
All Go tests succeeded! ✅

* Update vault-plugin-database-snowflake to v0.14.0

* Add changelog

---------

Co-authored-by: Ryan Cragun <me@ryan.ec>

 Conflicts:
	go.mod
@ryancragun ryancragun force-pushed the backport/VAULT-36485/update/vault-plugin-database-snowflake/v0.14.0/fully-oriented-skink branch from 71d6a40 to 025785e Compare May 23, 2025 20:27
@ryancragun ryancragun marked this pull request as ready for review May 23, 2025 20:27
@ryancragun ryancragun requested a review from a team as a code owner May 23, 2025 20:27
@ryancragun ryancragun requested a review from ej-hashi May 23, 2025 20:27
@ryancragun ryancragun enabled auto-merge (squash) May 23, 2025 20:39
Copy link

Build Results:
All builds succeeded! ✅

@ryancragun ryancragun merged commit ce382f3 into release/1.19.x May 23, 2025
113 of 125 checks passed
@ryancragun ryancragun deleted the backport/VAULT-36485/update/vault-plugin-database-snowflake/v0.14.0/fully-oriented-skink branch May 23, 2025 21:18
@@ -150,7 +150,7 @@ require (
github.com/hashicorp/vault-plugin-database-mongodbatlas v0.14.0
github.com/hashicorp/vault-plugin-database-redis v0.5.0
github.com/hashicorp/vault-plugin-database-redis-elasticache v0.6.0
github.com/hashicorp/vault-plugin-database-snowflake v0.13.0
github.com/hashicorp/vault-plugin-database-snowflake v0.14.0
Copy link
Member

Choose a reason for hiding this comment

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

This probably should have been v0.13.1 now that I think of it; i.e. we'll need to create release/vault-1.19.x branch on github.com/hashicorp/vault-plugin-database-snowflake, update gosnowflake there, and tag v0.13.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants