Merge branch 'main' into stevendpclark/vault-25831-pki-est-support

hashicorp · Jun 3, 2024 · 1ebec24 · 1ebec24
2 parents 2dc02f3 + 4bbc945
commit 1ebec24
Show file tree

Hide file tree

Showing 14 changed files with 678 additions and 330 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,9 @@
 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`. Requires Vault 1.17+. *Available only for Vault Enterprise* ([#2249](https://github.com/hashicorp/terraform-provider-vault/pull/2249)). 
+* Add support for new WIF fields in `vault_aws_auth_backend_client`. Requires Vault 1.17+. *Available only for Vault Enterprise* ([#2243](https://github.com/hashicorp/terraform-provider-vault/pull/2243)).
+* Add support for new WIF fields in `vault_azure_secret_backend`. Requires Vault 1.17+. *Available only for Vault Enterprise* ([#2250](https://github.com/hashicorp/terraform-provider-vault/pull/2250))
 
 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
@@ -415,11 +415,15 @@ const (
 	FieldLink                          = "link"
 	FieldGranularity                   = "granularity"
 	FieldGranularityLevel              = "granularity_level"
+	FieldEC2Endpoint                   = "ec2_endpoint"
+	FieldSTSRegion                     = "sts_region"
+	FieldIAMServerIDHeaderValue        = "iam_server_id_header_value"
 	FieldListingVisibility             = "listing_visibility"
 	FieldPassthroughRequestHeaders     = "passthrough_request_headers"
 	FieldAllowedResponseHeaders        = "allowed_response_headers"
 	FieldDelegatedAuthAccessors        = "delegated_auth_accessors"
 	FieldPluginVersion                 = "plugin_version"
+  FieldUseMSGraphAPI                 = "use_microsoft_graph_api"
 	FieldEnabled                       = "enabled"
 	FieldDefaultMount                  = "default_mount"
 	FieldDefaultPathPolicy             = "default_path_policy"
@@ -493,14 +497,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"
+	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,13 +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))
+	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
 )