From b3fb9444f75ee3e02ba2abf7190fe982a334b728 Mon Sep 17 00:00:00 2001 From: Bobby Iliev Date: Thu, 19 Dec 2024 20:52:36 +0200 Subject: [PATCH 1/4] Update actions/checkout to v4 --- .github/workflows/acceptance.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/integration-self-hosted.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/terraform.yml | 2 +- .github/workflows/test.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index f7d689f6..9bd9f3a7 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -12,7 +12,7 @@ jobs: acceptance: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 5910b174..b772cb7c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -15,7 +15,7 @@ jobs: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: diff --git a/.github/workflows/integration-self-hosted.yml b/.github/workflows/integration-self-hosted.yml index 5b13485a..91c0a4ed 100644 --- a/.github/workflows/integration-self-hosted.yml +++ b/.github/workflows/integration-self-hosted.yml @@ -13,7 +13,7 @@ jobs: self-hosted: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Docker Compose Up run: docker compose up --build -d materialized materialized_init redpanda postgres localstack mysql provider diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 146aa912..83cabb92 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -13,7 +13,7 @@ jobs: saas: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Docker Compose Up run: docker compose up --build -d diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a62b42fc..11fce794 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow run: git fetch --prune --unshallow - name: Set up Go diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 70a1c616..71d35de2 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -9,7 +9,7 @@ jobs: terraform: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: hashicorp/setup-terraform@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2cef6f29..365b5477 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: From 819a80744d2a95042fc22bb6592ff567ad91872d Mon Sep 17 00:00:00 2001 From: Bobby Iliev Date: Thu, 19 Dec 2024 20:53:58 +0200 Subject: [PATCH 2/4] Upgrade GH action hashicorp/setup-terraform to v3 --- .github/workflows/acceptance.yml | 2 ++ .github/workflows/terraform.yml | 2 +- GNUmakefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 9bd9f3a7..1dd118ce 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -19,6 +19,8 @@ jobs: go-version-file: "go.mod" cache: true + - uses: hashicorp/setup-terraform@v3 + - name: Docker Compose Up run: docker compose up --build -d diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 71d35de2..ae86e596 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: hashicorp/setup-terraform@v2 + - uses: hashicorp/setup-terraform@v3 - run: terraform fmt -recursive -check -diff diff --git a/GNUmakefile b/GNUmakefile index 0fc1a3ea..c8c3c198 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -28,7 +28,7 @@ test: .PHONY: testacc testacc: - TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m -run TestAcc -parallel 1 + TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m -run TestAcc .PHONY: docs docs: From acbd6750ffbbb2c53183df85f21e504037fa46a0 Mon Sep 17 00:00:00 2001 From: Bobby Iliev Date: Thu, 19 Dec 2024 20:56:55 +0200 Subject: [PATCH 3/4] Trigger tests --- pkg/provider/provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index ce9eb5ac..c3cbfd8e 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -38,7 +38,7 @@ func Provider(version string) *schema.Provider { DefaultFunc: schema.EnvDefaultFunc("MZ_SSLMODE", "require"), Description: "For testing purposes, the SSL mode to use.", }, - // TODO: Switch name to Admin Endpoint for consistency: + // TODO: Switch name to Admin Endpoint for consistency "endpoint": { Type: schema.TypeString, Optional: true, From 79084afc520902a5e94445c4ddda193289c99e83 Mon Sep 17 00:00:00 2001 From: Bobby Iliev Date: Thu, 19 Dec 2024 21:22:54 +0200 Subject: [PATCH 4/4] Upgrade actions/setup-go to v5 --- .github/workflows/acceptance.yml | 4 +++- .github/workflows/documentation.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/terraform.yml | 2 ++ .github/workflows/test.yml | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 1dd118ce..7b4ff8e8 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -14,12 +14,14 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version-file: "go.mod" cache: true - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: 1.8.2 - name: Docker Compose Up run: docker compose up --build -d diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b772cb7c..dba781ef 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version-file: "go.mod" cache: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11fce794..20e74759 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Unshallow run: git fetch --prune --unshallow - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: "go.mod" cache: true diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index ae86e596..03387402 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -12,5 +12,7 @@ jobs: - uses: actions/checkout@v4 - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: 1.8.2 - run: terraform fmt -recursive -check -diff diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 365b5477..b53911f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version-file: "go.mod" cache: true