Merge branch 'main' into VAULT-25132/add-aws-auth-wif-fields

hashicorp · May 29, 2024 · 8ad4166 · 8ad4166
2 parents 29e47ed + 9abe699
commit 8ad4166
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 138 deletions.
diff --git a/.github/labeler-pull-request-triage.yml b/.github/labeler-pull-request-triage.yml
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 FEATURES:
 * Add support for `iam_tags` in `vault_aws_secret_backend_role` ([#2231](https://github.com/hashicorp/terraform-provider-vault/pull/2231)).
 * Add support for `inheritable` on `vault_quota_rate_limit` and `vault_quota_lease_count`. Requires Vault 1.15+.: ([#2133](https://github.com/hashicorp/terraform-provider-vault/pull/2133)).
+* Add support for new WIF fields in `vault_gcp_secret_backend` ([#2249](https://github.com/hashicorp/terraform-provider-vault/pull/2249))
 
 IMPROVEMENTS:
 * return a useful error when delete fails for the `vault_jwt_auth_backend_role` resource: ([#2232](https://github.com/hashicorp/terraform-provider-vault/pull/2232))

diff --git a/internal/consts/consts.go b/internal/consts/consts.go
@@ -488,15 +488,17 @@ const (
 	/*
 		Vault version constants
 	*/
-	VaultVersion190 = "1.9.0"
-	VaultVersion110 = "1.10.0"
-	VaultVersion111 = "1.11.0"
-	VaultVersion112 = "1.12.0"
-	VaultVersion113 = "1.13.0"
-	VaultVersion114 = "1.14.0"
-	VaultVersion115 = "1.15.0"
-	VaultVersion116 = "1.16.0"
-	VaultVersion117 = "1.17.0"
+	VaultVersion190    = "1.9.0"
+	VaultVersion110    = "1.10.0"
+	VaultVersion111    = "1.11.0"
+	VaultVersion112    = "1.12.0"
+	VaultVersion113    = "1.13.0"
+	VaultVersion114    = "1.14.0"
+	VaultVersion115    = "1.15.0"
+	VaultVersion116    = "1.16.0"
+	VaultVersion116Ent = "1.16.0+ent"
+	VaultVersion117    = "1.17.0"
+	VaultVersion117Ent = "1.17.0+ent"
 
 	/*
 		Vault auth methods

diff --git a/internal/provider/meta.go b/internal/provider/meta.go
@@ -35,14 +35,16 @@ const (
 var (
 	MaxHTTPRetriesCCC int
 
-	VaultVersion110 = version.Must(version.NewSemver(consts.VaultVersion110))
-	VaultVersion111 = version.Must(version.NewSemver(consts.VaultVersion111))
-	VaultVersion112 = version.Must(version.NewSemver(consts.VaultVersion112))
-	VaultVersion113 = version.Must(version.NewSemver(consts.VaultVersion113))
-	VaultVersion114 = version.Must(version.NewSemver(consts.VaultVersion114))
-	VaultVersion115 = version.Must(version.NewSemver(consts.VaultVersion115))
-	VaultVersion116 = version.Must(version.NewSemver(consts.VaultVersion116))
-	VaultVersion117 = version.Must(version.NewSemver(consts.VaultVersion117))
+	VaultVersion110    = version.Must(version.NewSemver(consts.VaultVersion110))
+	VaultVersion111    = version.Must(version.NewSemver(consts.VaultVersion111))
+	VaultVersion112    = version.Must(version.NewSemver(consts.VaultVersion112))
+	VaultVersion113    = version.Must(version.NewSemver(consts.VaultVersion113))
+	VaultVersion114    = version.Must(version.NewSemver(consts.VaultVersion114))
+	VaultVersion115    = version.Must(version.NewSemver(consts.VaultVersion115))
+	VaultVersion116    = version.Must(version.NewSemver(consts.VaultVersion116))
+	VaultVersion116Ent = version.Must(version.NewSemver(consts.VaultVersion116Ent))
+	VaultVersion117    = version.Must(version.NewSemver(consts.VaultVersion117))
+	VaultVersion117Ent = version.Must(version.NewSemver(consts.VaultVersion117Ent))
 
 	TokenTTLMinRecommended = time.Minute * 15
 )