From 662ee2cc3c461a583916aabcf96ab7944c795581 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Wed, 17 Apr 2024 14:22:49 -0500 Subject: [PATCH 1/4] chore: update vault build test matrix --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fb7d468e..86beaeb3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,9 @@ jobs: - "vault-enterprise:1.11.12-ent" - "vault-enterprise:1.12.11-ent" - "vault-enterprise:1.13.13-ent" - - "vault-enterprise:1.14.10-ent" - - "vault-enterprise:1.15.6-ent" + - "vault-enterprise:1.14.11-ent" + - "vault-enterprise:1.15.7-ent" + - "vault-enterprise:1.16.1-ent" - "vault:latest" services: vault: From 0a428f4ded283859f39c88e290d635556a9152cd Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Wed, 17 Apr 2024 14:23:37 -0500 Subject: [PATCH 2/4] bump go version --- .go-version | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index c262b1f0d..6fee2fedb 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.6 +1.22.2 diff --git a/go.mod b/go.mod index b8b413b61..0e3f59178 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/terraform-provider-vault -go 1.21 +go 1.22 require ( cloud.google.com/go/compute/metadata v0.2.3 From 93cc5890d7e5933d70c7c14b692d75b2285c3e63 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Wed, 17 Apr 2024 14:51:37 -0500 Subject: [PATCH 3/4] revert go version bump --- .go-version | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index 6fee2fedb..c262b1f0d 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.2 +1.21.6 diff --git a/go.mod b/go.mod index 0e3f59178..b8b413b61 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/terraform-provider-vault -go 1.22 +go 1.21 require ( cloud.google.com/go/compute/metadata v0.2.3 From 48a48c9e1b31be916807308a5129a266ff2fbe1f Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Wed, 17 Apr 2024 16:41:33 -0500 Subject: [PATCH 4/4] skip secrets sync test; deprecate azure secrets field --- vault/resource_azure_secret_backend.go | 1 + vault/resource_secrets_sync_config_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/vault/resource_azure_secret_backend.go b/vault/resource_azure_secret_backend.go index 7f1e0c674..6d3108c9e 100644 --- a/vault/resource_azure_secret_backend.go +++ b/vault/resource_azure_secret_backend.go @@ -53,6 +53,7 @@ func azureSecretBackendResource() *schema.Resource { Description: "Human-friendly description of the mount for the backend.", }, "use_microsoft_graph_api": { + Deprecated: "This field is not supported in Vault-1.12+ and is the default behavior. This field will be removed in future version of the provider.", Type: schema.TypeBool, Optional: true, Computed: true, diff --git a/vault/resource_secrets_sync_config_test.go b/vault/resource_secrets_sync_config_test.go index 368e7d6b0..c80ed4e50 100644 --- a/vault/resource_secrets_sync_config_test.go +++ b/vault/resource_secrets_sync_config_test.go @@ -14,6 +14,7 @@ import ( ) func TestSecretsSyncConfig(t *testing.T) { + testutil.SkipTestEnvUnset(t, "VAULT_SECRETS_SYNC_ENABLED") resourceName := "vault_secrets_sync_config.test" resource.Test(t, resource.TestCase{