test: cleanup test setup (#829)

- Remove unused script
- Remove custom linting script in favor of golangci lint
- Remove old TTS leftover
- Format/cleanf files
- Pick go version from go.mod file

Author: jooola

.errcheck_excludes.txt

@@ -28,7 +28,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: go.mod
       -
         name: Import GPG key
         id: import_gpg

.github/workflows/dev_release.yml

@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: go.mod
           cache: false
-      
+
       - uses: golangci/golangci-lint-action@v3
         with:
           version: v1.55.2 # renovate: datasource=github-releases depName=golangci/golangci-lint

.github/workflows/lint.yml

@@ -29,7 +29,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: go.mod
       -
         name: Import GPG key
         id: import_gpg

.github/workflows/release.yml

@@ -1,76 +1,58 @@
 name: Test
 
 on:
+  push:
+    branches: [main]
   pull_request:
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - run: make test
+
   integration:
-    name: Integration ${{ matrix.terraform }}
+    runs-on: ubuntu-latest
+
     permissions:
       id-token: write
-    runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        terraform: [ v1.5.x, v1.6.x ]
+        terraform: [v1.5.x, v1.6.x]
       fail-fast: false
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Unshallow
-        run: git fetch --prune --unshallow
+      - uses: actions/checkout@v4
+
       - uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: ${{ matrix.terraform }}
           terraform_wrapper: false
-      - name: Set up Go
-        uses: actions/setup-go@v5
+
+      - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
-      - name: HCLOUD_TOKEN
-        env:
-          HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
-        run: |
-          echo "HCLOUD_TOKEN=$HCLOUD_TOKEN" >> "$GITHUB_ENV"
+          go-version-file: go.mod
 
       - uses: hetznercloud/tps-action@main
-        if: ${{ vars.USE_TPS }}
 
-      - name: check HCLOUD_TOKEN
-        run: |
-          if [[ "${HCLOUD_TOKEN:-}" == "" ]]; then
-            echo "::error ::Couldn't determine HCLOUD_TOKEN. Are repository secrets correctly set?"
-            exit 1
-          fi
-      - name: Run tests
+      - run: make testacc
         env:
-          # Domain must be available in the account running the tests. This domain is available in the account
-          # running the public integration tests.
+          # Domain must be available in the account running the tests. This domain is
+          # available in the account running the public integration tests.
           CERT_DOMAIN: hc-integrations-test.de
 
-          # Debug Logs
           TF_LOG: DEBUG
           TF_LOG_PATH: test.log
-        run: |
-          make testacc
-          make
 
       - uses: actions/upload-artifact@v4
-        if: always() # Also run if the tests failed
+        if: always()
         with:
           name: debug-logs-${{ matrix.terraform }}
           path: internal/e2etests/**/test.log
-
-  unit_tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Unshallow
-        run: git fetch --prune --unshallow
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.21"
-      - name: Run tests
-        run: |
-          make test

.github/workflows/test.yml

@@ -1,13 +1,15 @@
 ---
 linters-settings:
   errcheck:
-    exclude: ./.errcheck_excludes.txt
+    exclude-functions:
+      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set
   misspell:
-    locale: "US"
+    locale: US
 
 linters:
   disable-all: true
   enable:
+    - gofmt
     - bodyclose
     - errcheck
     - exportloopref
@@ -33,8 +35,5 @@ issues:
         - exportloopref
         - gosec
         - errcheck
-    - path: testing.go
+    - path: testing\.go
       text: unused-parameter
-    - linters:
-        - gosec
-      text: "G401:"

.golangci.yaml

@@ -1,13 +1,12 @@
-TEST?=$$(go list ./... |grep -v 'vendor')
-GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
+TEST?=./...
 VERSION=$(shell ./scripts/git-version.sh)
 PKG_NAME=hcloud
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 export CGO_ENABLED:=0
 
 default: build
 
-build: fmtcheck
+build:
 	go install
 
 clean:
@@ -56,39 +55,14 @@ _output/terraform-provider-hcloud_%.zip: bin/%/terraform-provider-hcloud
 	cp bin/$*/terraform-provider-hcloud README.md CHANGELOG.md LICENSE $(DEST)
 	cd $(DEST) && zip -r ../$(NAME).zip .
 
-test: fmtcheck
-	go test $(TEST) || exit 1
-	echo $(TEST) | \
-		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=8
+lint:
+	golangci-lint run --fix
 
-testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 30m -parallel=8
+test:
+	go test $(TEST) $(TESTARGS) -v -timeout=30s -parallel=8
 
-vet:
-	@echo "go vet ."
-	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
-		echo ""; \
-		echo "Vet found suspicious constructs. Please check the reported constructs"; \
-		echo "and fix them if necessary before submitting the code for review."; \
-		exit 1; \
-	fi
-
-fmt:
-	gofmt -w $(GOFMT_FILES)
-
-fmtcheck:
-	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
-
-errcheck:
-	@sh -c "'$(CURDIR)/scripts/errcheck.sh'"
-
-test-compile:
-	@if [ "$(TEST)" = "./..." ]; then \
-		echo "ERROR: Set TEST to a specific package. For example,"; \
-		echo "  make test-compile TEST=./aws"; \
-		exit 1; \
-	fi
-	go test -c $(TEST) $(TESTARGS)
+testacc:
+	TF_ACC=1 go test $(TEST) $(TESTARGS) -v -timeout=30m -parallel=8
 
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
@@ -105,4 +79,4 @@ endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
 
-.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile release clean clean-release website website-test
+.PHONY: build test testacc release clean clean-release website website-test

GNUmakefile

@@ -1,31 +1,29 @@
 #!/usr/bin/env bash
 
-set -e
+set -eu
 
 # parse the current git commit hash
-COMMIT=`git rev-parse HEAD`
+COMMIT="$(git rev-parse HEAD)"
 
 # check if the current commit has a matching tag
-TAG=$(git describe --exact-match --abbrev=0 --tags ${COMMIT} 2> /dev/null || true)
-SUFFIX=''
-DETAIL=''
+TAG="$(git describe --exact-match --abbrev=0 --tags "$COMMIT" 2> /dev/null || true)"
+SUFFIX=""
+DETAIL=""
 
 # use the matching tag as the version, if available
 if [ -z "$TAG" ]; then
   TAG=$(git describe --abbrev=0)
-  COMMITS=$(git --no-pager log ${TAG}..HEAD --oneline)
-  COMMIT_COUNT=$(echo -e "${COMMITS}" | wc -l)
-  COMMIT_COUNT_PADDING=$(printf %03d $COMMIT_COUNT)
+  COMMITS=$(git --no-pager log "$TAG..HEAD" --oneline)
+  COMMIT_COUNT=$(echo -e "$COMMITS" | wc -l)
+  COMMIT_COUNT_PADDING=$(printf %03d "$COMMIT_COUNT")
   SHORT_COMMIT_ID=$(git rev-parse --short HEAD)
 
-  SUFFIX='-dev'
+  SUFFIX="-dev"
   DETAIL=".${COMMIT_COUNT_PADDING}.${SHORT_COMMIT_ID}"
 fi
 
 if [ -n "$(git diff --shortstat 2> /dev/null | tail -n1)" ]; then
   SUFFIX="-dirty"
 fi
 
-
-VERSION="${TAG}${SUFFIX}${DETAIL}"
-echo $VERSION
+echo "${TAG}${SUFFIX}${DETAIL}"