Resolve conflicts in test.yml (#112)

Author: bendbennett

.github/workflows/test.yml

@@ -1,5 +1,4 @@
-name: Test
-
+name: Tests
 on:
   pull_request:
     branches: [ main ]
@@ -13,76 +12,65 @@ on:
       - 'README.md'
       - 'CHANGELOG.md'
       - 'website/*'
-
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
 
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
-        id: go
-
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
-      - name: Run linters
-        uses: golangci/golangci-lint-action@v3
+      - name: Set up Go
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
-          version: latest
+          go-version-file: 'go.mod'
+        id: go
 
-      - name: Generate
-        run: make generate
+      - name: Go fmt
+        run: |
+          make fmt
 
-      - name: Confirm no diff
+      - name: Go vet
         run: |
-          git diff --compact-summary --exit-code || \
-            (echo "*** Unexpected differences after code generation. Run 'make generate' and commit."; exit 1)
+          make vet
 
       - name: Build
-        run: make build
+        run: |
+          go build -v .
+  
 
+  # run acceptance tests in a matrix with Terraform core versions
   test:
-    name: 'Acc. Tests (OS: ${{ matrix.os }} / TF: ${{ matrix.terraform }})'
+    name: Matrix Test
     needs: build
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - macos-latest
-          - windows-latest
-          - ubuntu-latest
+        os: [macos-latest, windows-latest, ubuntu-latest]
         terraform:
-          - '0.12.*'
-          - '0.13.*'
-          - '0.14.*'
-          - '0.15.*'
-          - '1.0.*'
-          - '1.1.*'
-          - '1.2.*'
-          - '1.3.*'
+          - '0.12.31'
+          - '0.13.7'
+          - '0.14.11'
+          - '0.15.1'
     steps:
 
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
-          check-latest: true
-
-      - name: Check out code
-        uses: actions/checkout@v3
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
-      - name: Setup Terraform ${{ matrix.terraform }}
-        uses: hashicorp/setup-terraform@v2
+      - name: Set up Go
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
-          terraform_version: ${{ matrix.terraform }}
-          terraform_wrapper: false
+          go-version-file: 'go.mod'
+        id: go
 
-      - name: Run acceptance test
-        run: make testacc
+      - name: TF acceptance tests
+        timeout-minutes: 10
+        env:
+          TF_ACC: "1"
+          TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}
+        run: |
+          go test -v -cover ./internal/provider/