resolve conflicts with main

hashicorp · Oct 30, 2023 · 1db6409 · 1db6409
2 parents caea184 + be64448
commit 1db6409
Show file tree

Hide file tree

Showing 58 changed files with 1,363 additions and 968 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,10 @@
 name: Build
 
-on: push
+on:
+  push:
+    paths-ignore:
+      - 'website/**'
+      - 'CHANGELOG.md'
 
 permissions:
   # Permission for checking out code

diff --git a/.github/workflows/go-checks.yaml b/.github/workflows/go-checks.yaml
@@ -1,6 +1,9 @@
 name: Go checks
 on:
   push:
+    paths-ignore:
+      - 'website/**'
+      - 'CHANGELOG.md'
 jobs:
   go-checks:
     # using `main` as the ref will keep your workflow up-to-date

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,13 @@ FEATURES:
 * BUGS:
 * Fix panic when reading `client_secret` from a public oidc client ([#2048](https://github.com/hashicorp/terraform-provider-vault/pull/2048))
 * Add support for `custom_metadata` on `vault_namespace`: ([#2033](https://github.com/hashicorp/terraform-provider-vault/pull/2033))
+* Add support for `OCSP*` role fields for the cert auth resource: ([#2056](https://github.com/hashicorp/terraform-provider-vault/pull/2056))
 
 BUGS:
 * Fix panic when reading `client_secret` from a public oidc client ([#2048](https://github.com/hashicorp/terraform-provider-vault/pull/2048))
 * Fix API request missing `roles` field for `mongodbatlas_secret_role` resource ([#2047](https://github.com/hashicorp/terraform-provider-vault/pull/2047))
+* Fix bug when updating vault_azure_secret_backend_role: ([#2063](https://github.com/hashicorp/terraform-provider-vault/pull/2063))
+* Fix audience string ordering for `auth_login_gcp` causing GCE auth to fail ([#2064](https://github.com/hashicorp/terraform-provider-vault/pull/2064))
 
 IMPROVEMENTS:
 * Updated dependencies: ([#2038](https://github.com/hashicorp/terraform-provider-vault/pull/2038))

diff --git a/generated/datasources/transform/decode/role_name_test.go b/generated/datasources/transform/decode/role_name_test.go
diff --git a/generated/datasources/transform/encode/role_name_test.go b/generated/datasources/transform/encode/role_name_test.go
diff --git a/generated/resources/transform/alphabet/name_test.go b/generated/resources/transform/alphabet/name_test.go