From 48007715600defa92ccb46214c8142487734b004 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:47:29 +0000
Subject: [PATCH] chore(deps): Bump github.com/jacobbrewer1/vaulty from 0.1.6
 to 0.1.7

Bumps [github.com/jacobbrewer1/vaulty](https://github.com/jacobbrewer1/vaulty) from 0.1.6 to 0.1.7.
- [Release notes](https://github.com/jacobbrewer1/vaulty/releases)
- [Commits](https://github.com/jacobbrewer1/vaulty/compare/v0.1.6...v0.1.7)

---
updated-dependencies:
- dependency-name: github.com/jacobbrewer1/vaulty
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod                                        |  2 +-
 go.sum                                        |  4 ++--
 .../github.com/jacobbrewer1/vaulty/client.go  |  2 --
 .../jacobbrewer1/vaulty/client_opts.go        | 22 +++++++++++++++++--
 .../github.com/jacobbrewer1/vaulty/token.go   |  8 +++++++
 vendor/modules.txt                            |  2 +-
 6 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 vendor/github.com/jacobbrewer1/vaulty/token.go

diff --git a/go.mod b/go.mod
index 633aecb..64a2df3 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/vault/api v1.15.0
 	github.com/huandu/xstrings v1.5.0
 	github.com/jacobbrewer1/patcher v0.1.16
-	github.com/jacobbrewer1/vaulty v0.1.6
+	github.com/jacobbrewer1/vaulty v0.1.7
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/pingcap/tidb/pkg/parser v0.0.0-20241220080229-acba0cd1e2b0
 	github.com/prometheus/client_golang v1.20.5
diff --git a/go.sum b/go.sum
index ff9ecd2..0e8015e 100644
--- a/go.sum
+++ b/go.sum
@@ -96,8 +96,8 @@ github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jacobbrewer1/patcher v0.1.16 h1:AO3Um5QVMQibV6akHVA+OjLNB7uQGyHz4NGp51BX/fs=
 github.com/jacobbrewer1/patcher v0.1.16/go.mod h1:zEgOixvOt2wO2WmoUreN5L5qJpCOdP2eWiYd0XZULn8=
-github.com/jacobbrewer1/vaulty v0.1.6 h1:h+STKGtDwVugWmeVu3ixlWiuU/DQYmJj0x5ADq1jm5Y=
-github.com/jacobbrewer1/vaulty v0.1.6/go.mod h1:kKQcDjAdRZLTlaOv6HbhqDXObDjIBgWC7FBC9rdDfbA=
+github.com/jacobbrewer1/vaulty v0.1.7 h1:Y1UVwFu/zwQK3octiLh95DefSfxZ0ano25UowpYfbfc=
+github.com/jacobbrewer1/vaulty v0.1.7/go.mod h1:8yPrEqRwBSjVK+CUo7vQ81cDJwIzrouoaqHYy9kX0cg=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
diff --git a/vendor/github.com/jacobbrewer1/vaulty/client.go b/vendor/github.com/jacobbrewer1/vaulty/client.go
index 097483a..1a87798 100644
--- a/vendor/github.com/jacobbrewer1/vaulty/client.go
+++ b/vendor/github.com/jacobbrewer1/vaulty/client.go
@@ -89,8 +89,6 @@ func NewClient(opts ...ClientOption) (Client, error) {
 
 	c.authCreds = authCreds
 
-	go c.renewAuthInfo()
-
 	return c, nil
 }
 
diff --git a/vendor/github.com/jacobbrewer1/vaulty/client_opts.go b/vendor/github.com/jacobbrewer1/vaulty/client_opts.go
index f1d0109..7735e10 100644
--- a/vendor/github.com/jacobbrewer1/vaulty/client_opts.go
+++ b/vendor/github.com/jacobbrewer1/vaulty/client_opts.go
@@ -36,10 +36,23 @@ func WithConfig(config *hashiVault.Config) ClientOption {
 	}
 }
 
+func WithTokenAuth(token string) ClientOption {
+	return func(c *client) {
+		c.auth = func(v *hashiVault.Client) (*hashiVault.Secret, error) {
+			return tokenLogin(v, token)
+		}
+	}
+}
+
 func WithAppRoleAuth(roleID, secretID string) ClientOption {
 	return func(c *client) {
 		c.auth = func(v *hashiVault.Client) (*hashiVault.Secret, error) {
-			return appRoleLogin(v, roleID, secretID)
+			sec, err := appRoleLogin(v, roleID, secretID)
+			if err != nil {
+				return nil, err
+			}
+			go c.renewAuthInfo()
+			return sec, nil
 		}
 	}
 }
@@ -47,7 +60,12 @@ func WithAppRoleAuth(roleID, secretID string) ClientOption {
 func WithUserPassAuth(username, password string) ClientOption {
 	return func(c *client) {
 		c.auth = func(v *hashiVault.Client) (*hashiVault.Secret, error) {
-			return userPassLogin(v, username, password)
+			sec, err := userPassLogin(v, username, password)
+			if err != nil {
+				return nil, err
+			}
+			go c.renewAuthInfo()
+			return sec, nil
 		}
 	}
 }
diff --git a/vendor/github.com/jacobbrewer1/vaulty/token.go b/vendor/github.com/jacobbrewer1/vaulty/token.go
new file mode 100644
index 0000000..24e233a
--- /dev/null
+++ b/vendor/github.com/jacobbrewer1/vaulty/token.go
@@ -0,0 +1,8 @@
+package vaulty
+
+import hashiVault "github.com/hashicorp/vault/api"
+
+func tokenLogin(v *hashiVault.Client, token string) (*hashiVault.Secret, error) {
+	v.SetToken(token)
+	return v.Auth().Token().LookupSelf()
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index b0ad3e9..02f1f2f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -112,7 +112,7 @@ github.com/imdario/mergo
 ## explicit; go 1.23
 github.com/jacobbrewer1/patcher
 github.com/jacobbrewer1/patcher/inserter
-# github.com/jacobbrewer1/vaulty v0.1.6
+# github.com/jacobbrewer1/vaulty v0.1.7
 ## explicit; go 1.23
 github.com/jacobbrewer1/vaulty
 # github.com/jmoiron/sqlx v1.4.0