remove golines

.github/workflows/test.yml

@@ -18,7 +18,7 @@ permissions:
 jobs:
   # Ensure project builds before running testing matrix
   build:
-    name: Build
+    name: Build and unit test
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -27,12 +27,21 @@ jobs:
         with:
           go-version-file: 'go.mod'
           cache: true
-      - run: go mod download
+      - run: make fmt
       - run: go build -v .
-      - name: Run linters
-        uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
+      - run: make test
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          version: latest
+          go-version-file: 'go.mod'
+          cache: true
+      - run: make validate-fmt
+
 
   generate:
     runs-on: ubuntu-latest
@@ -80,7 +89,7 @@ jobs:
         with:
           terraform_version: ${{ matrix.terraform }}
           terraform_wrapper: false
-      - run: go mod download
+      - run: make fmt
       - env:
           TF_ACC: "1"
         run: go test -v -cover ./internal/provider/

Makefile

@@ -10,7 +10,6 @@ $(ENVTEST_ASSETS_DIR):
 	mkdir -p $(ENVTEST_ASSETS_DIR)
 MOCKERY ?= $(ENVTEST_ASSETS_DIR)/mockery
 OAPI_CODEGEN ?= $(ENVTEST_ASSETS_DIR)/oapi-codegen
-LINTER ?= $(ENVTEST_ASSETS_DIR)/golangci-lint
 
 # Run acceptance tests
 .PHONY: testacc
@@ -25,16 +24,23 @@ test:
 
 .PHONY: fmt
 fmt:
-	golines -w ./
 	gofmt -w ./
 	goimports -w ./
 	[ -z "$$CIRCLECI" ] || git diff --exit-code --color=always # In CI: exit if anything changed
 
+.PHONY: validate-fmt
+validate-fmt:
+	@output=$$(gofmt -l ./); \
+	if [ -n "$$output" ]; then \
+		echo "$$output"; \
+		echo "Please run 'make fmt' to format the code"; \
+		exit 1; \
+	fi
+
 .PHONY: dep
 dep:
 	go mod download
 	go install golang.org/x/tools/cmd/goimports
-	go install github.com/segmentio/golines@latest
 	go mod tidy
 
 .PHONY: build