From 501691994c9624fa72694752f1f634d7f931419d Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Tue, 16 Apr 2024 17:11:54 -0400 Subject: [PATCH 1/3] workflows: Remove wildcard suffix from Terraform workflow call --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 27d6930..132fc53 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: run: make build test: - name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }})' + name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }} needs: build runs-on: ${{ matrix.os }} timeout-minutes: 15 @@ -82,7 +82,7 @@ jobs: with: # TODO: Temporary change has been made to `vars.TF_VERSIONS_PROTOCOL_V5` to include the `.*` to enable us # to utilize the v1.8.0-beta1 version of Terraform. This should be reverted once Terraform v1.8.0 is released. - # terraform_version: ${{ matrix.terraform }}.* + # terraform_version: ${{ matrix.terraform }} terraform_version: ${{ matrix.terraform }} terraform_wrapper: false From 2cca660117645bc2a4322c86e9c278fca4818c1b Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Tue, 16 Apr 2024 17:17:28 -0400 Subject: [PATCH 2/3] fix and remove temp fixes --- .github/workflows/test.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 132fc53..af1856e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,13 +37,6 @@ jobs: with: version: latest - # TODO: Temporary addition to ensure plugin-docs uses the v1.8.0-beta1 version of Terraform. This should be reverted once Terraform v1.8.0 is released. - - name: Setup Terraform (supporting provider functions) - uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0 - with: - terraform_version: v1.8.0-beta1 - terraform_wrapper: false - - name: Generate run: make generate @@ -56,7 +49,7 @@ jobs: run: make build test: - name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }} + name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }}' needs: build runs-on: ${{ matrix.os }} timeout-minutes: 15 @@ -80,9 +73,6 @@ jobs: - name: Setup Terraform ${{ matrix.terraform }} uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0 with: - # TODO: Temporary change has been made to `vars.TF_VERSIONS_PROTOCOL_V5` to include the `.*` to enable us - # to utilize the v1.8.0-beta1 version of Terraform. This should be reverted once Terraform v1.8.0 is released. - # terraform_version: ${{ matrix.terraform }} terraform_version: ${{ matrix.terraform }} terraform_wrapper: false From 11f358f5c4e6e8d4ab2b3cebd94c59067b1d1d68 Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Tue, 16 Apr 2024 17:21:00 -0400 Subject: [PATCH 3/3] fix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af1856e..8c2f18c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: run: make build test: - name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }}' + name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }})' needs: build runs-on: ${{ matrix.os }} timeout-minutes: 15