Merge branch 'main' into apply-client-updates

Author: JohannesHepp

.github/workflows/checks.yaml

@@ -12,7 +12,6 @@ defaults:
 
 env:
   GO_VERSION: "1.24.1"
-  GOLANG_CI_VERSION: v1.64.7
 
 jobs:
   lint:
@@ -25,6 +24,4 @@ jobs:
           cache: false
       - uses: actions/checkout@v4
       - name: lint
-        uses: golangci/golangci-lint-action@v7
-        with:
-          version: ${{ env.GOLANG_CI_VERSION }}
+        uses: golangci/golangci-lint-action@v6

.golangci.yml

@@ -2,53 +2,25 @@ VERSION ?= 0.0.0-dev
 
 .PHONY: clean
 clean:
-	rm -rf bin/
 	rm -rf release/
 	rm -rf dist/
 
 .PHONY: lint
-lint: golangci-lint ## Run golang-ci-lint against code.
-	$(GOLANGCI_LINT) run ./...
+lint: ## Run golang-ci-lint against code.
+	go tool golangci-lint run ./...
+
+.PHONY: lint-fix
+lint-fix: ## Run golang-ci-lint against code and apply fixes.
+	go tool golangci-lint run --fix ./...
 
 ## Location to create the release
 RELEASE_DIR ?= $(shell pwd)/release
 $(RELEASE_DIR):
 	mkdir -p $(RELEASE_DIR)
 
 .PHONY: release
-release: gox gomplate $(RELEASE_DIR) ## Run release artifacts
-	CGO_ENABLED=0 $(GOX) -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -os="linux darwin windows" -arch="amd64 arm64"
-	VERSION=$(VERSION) $(GOMPLATE) -f hack/provider.yaml.tpl > $(RELEASE_DIR)/provider.yaml
+release: $(RELEASE_DIR) ## Run release artifacts
+	CGO_ENABLED=0 go tool gox -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -os="linux darwin windows" -arch="amd64 arm64"
+	VERSION=$(VERSION) go tool gomplate -f hack/provider.yaml.tpl > $(RELEASE_DIR)/provider.yaml
 	mv dist/* $(RELEASE_DIR)
-	rm -rf dist/
-
-## Location to install dependencies to
-LOCALBIN ?= $(shell pwd)/bin
-$(LOCALBIN):
-	mkdir -p $(LOCALBIN)
-
-## Tool Binaries
-GOX ?= $(LOCALBIN)/gox
-GOMPLATE ?= $(LOCALBIN)/gomplate
-GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
-
-## Tool Versions
-GOX_VERSION ?= latest
-GOMPLATE_VERSION ?= v4.3.1
-GOLANGCI_LINT_VERSION ?= v1.64.7
-
-.PHONY: gox
-gox: $(GOX)
-$(GOX): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install github.com/mitchellh/gox@$(GOX_VERSION)
-
-.PHONY: gomplate
-gomplate: $(GOMPLATE)
-$(GOMPLATE): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install github.com/hairyhenderson/gomplate/v4/cmd/gomplate@$(GOMPLATE_VERSION)
-
-.PHONY: golangci-lint
-golangci-lint: $(GOLANGCI_LINT)
-$(GOLANGCI_LINT): $(GOLANGCI_LINT)
-	test -s $(LOCALBIN)/golangci-lint && $(LOCALBIN)/golangci-lint version | grep -q $(GOLANGCI_LINT_VERSION) || \
-	GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	rm -rf dist/