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

hashicorp · May 28, 2024 · 29e47ed · 29e47ed
2 parents a2d54e3 + 4ef2eea
commit 29e47ed
Show file tree

Hide file tree

Showing 8 changed files with 320 additions and 55 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -4,5 +4,4 @@
 self-hosted-runner:
   # Labels of custom runners in array of string
   labels:
-    - custom
-    - custom-linux-large
+    - custom-linux-large
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           make test
   acceptance:
     needs: [go-version, build]
-    runs-on: [custom, linux, custom-linux-large]
+    runs-on: custom-linux-large
     strategy:
       fail-fast: false
       matrix:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ FEATURES:
 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))
 
+BUGS:
+* add missing `custom_tags` and `secret_name_template` fields to `vault_secrets_sync_azure_destination` resource ([#2247](https://github.com/hashicorp/terraform-provider-vault/pull/2247))
+
 ## 4.2.0 (Mar 27, 2024)
 
 FEATURES:

diff --git a/internal/consts/consts.go b/internal/consts/consts.go
@@ -418,6 +418,11 @@ const (
 	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"
 
 	/*
 		common environment variables