Run tfproviderlint as a golangci-lint plugin

Author: armsnyder

.github/workflows/pr-lint.yml

@@ -28,7 +28,6 @@ jobs:
       matrix:
         target:
           - lint-golangci
-          - lint-tfprovider
           - lint-examples-tf
           - lint-examples-sh
           - lint-generated

.github/workflows/push.yml

@@ -40,7 +40,6 @@ jobs:
       matrix:
         target:
           - lint-golangci
-          - lint-tfprovider
           - lint-examples-tf
           - lint-examples-sh
           - lint-generated

.golangci.yml

@@ -4,10 +4,16 @@ run:
   timeout: 3m
 
 linters-settings:
+  custom:
+    tfproviderlint:
+      path: ./bin/tfproviderlint-plugin.so
+      description: "Terraform Provider Lint Tool"
+      original-url: https://github.com/bflad/tfproviderlint
   errcheck:
     exclude: errcheck_excludes.txt
 
 linters:
   enable:
     - gofmt
     - govet
+    - tfproviderlint

GNUmakefile

@@ -21,21 +21,15 @@ endif
 test: ## Run unit tests.
 	go test $(TESTARGS) $(PROVIDER_SRC_DIR)
 
-TFPROVIDERLINTX_CHECKS = -XAT001=false -XR003=false -XS002=false
-
-fmt: tool-golangci-lint tool-tfproviderlintx tool-terraform tool-shfmt ## Format files and fix issues.
+fmt: tool-golangci-lint tool-terraform tool-shfmt tfproviderlint-plugin ## Format files and fix issues.
 	gofmt -w -s .
 	$(GOBIN)/golangci-lint run --fix
-	$(GOBIN)/tfproviderlintx $(TFPROVIDERLINTX_CHECKS) --fix ./...
 	$(GOBIN)/terraform fmt -recursive -list ./examples
 	$(GOBIN)/shfmt -l -s -w ./examples
 
-lint-golangci: tool-golangci-lint ## Run golangci-lint linter (same as fmt but without modifying files).
+lint-golangci: tool-golangci-lint tfproviderlint-plugin ## Run golangci-lint linter (same as fmt but without modifying files).
 	$(GOBIN)/golangci-lint run
 
-lint-tfprovider: tool-tfproviderlintx ## Run tfproviderlintx linter (same as fmt but without modifying files).
-	$(GOBIN)/tfproviderlintx $(TFPROVIDERLINTX_CHECKS) ./...
-
 lint-examples-tf: tool-terraform ## Run terraform linter on examples (same as fmt but without modifying files).
 	$(GOBIN)/terraform fmt -recursive -check ./examples
 
@@ -73,7 +67,7 @@ testacc-down: ## Teardown a GitLab instance.
 	docker-compose down --volumes
 
 testacc: ## Run acceptance tests against a GitLab instance.
-	TF_ACC=1 GITLAB_TOKEN=$(GITLAB_TOKEN) GITLAB_BASE_URL=$(GITLAB_BASE_URL) go test -v $(PROVIDER_SRC_DIR) $(TESTARGS) -timeout 40m -tags acceptance
+	TF_ACC=1 GITLAB_TOKEN=$(GITLAB_TOKEN) GITLAB_BASE_URL=$(GITLAB_BASE_URL) go test -v $(PROVIDER_SRC_DIR) $(TESTARGS) -timeout 40m
 
 certs: ## Generate certs for the GitLab container registry
 	mkdir -p certs
@@ -85,9 +79,6 @@ certs: ## Generate certs for the GitLab container registry
 tool-golangci-lint:
 	@$(call install-tool, github.com/golangci/golangci-lint/cmd/golangci-lint)
 
-tool-tfproviderlintx:
-	@$(call install-tool, github.com/bflad/tfproviderlint/cmd/tfproviderlintx)
-
 tool-tfplugindocs:
 	@$(call install-tool, github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs)
 
@@ -110,4 +101,7 @@ tool-terraform:
 	@[ -f $(GOBIN)/terraform ] || { mkdir -p tmp; cd tmp; rm -rf terraform; git clone --branch $(TERRAFORM_VERSION) --depth 1 https://github.com/hashicorp/terraform.git; cd terraform; GOBIN=$(GOBIN) go install; cd ..; rm -rf terraform; }
 
 clean: testacc-down
-	@rm -rf certs/
+	@rm -rf certs/
+
+tfproviderlint-plugin:
+	@cd tools && go build -buildmode=plugin -o $(GOBIN)/tfproviderlint-plugin.so ./cmd/tfproviderlint-plugin

tools/cmd/tfproviderlint-plugin/main.go

@@ -0,0 +1,39 @@
+// Program tfproviderlint-plugin is a custom linter plugin for golangci-lint which runs the
+// tfproviderlint analyzers.
+//
+// See: https://golangci-lint.run/contributing/new-linters/#create-a-plugin
+package main
+
+import (
+	"github.com/bflad/tfproviderlint/passes"
+	"github.com/bflad/tfproviderlint/xpasses"
+	"golang.org/x/tools/go/analysis"
+)
+
+var excludes = []string{
+	"XAT001",
+	"XR003",
+	"XS002",
+}
+
+type analyzerPlugin struct{}
+
+func (*analyzerPlugin) GetAnalyzers() []*analysis.Analyzer {
+	excludesSet := make(map[string]struct{}, len(excludes))
+
+	for _, exclude := range excludes {
+		excludesSet[exclude] = struct{}{}
+	}
+
+	var analyzers []*analysis.Analyzer
+
+	for _, analyzer := range append(passes.AllChecks, xpasses.AllChecks...) {
+		if _, isExcluded := excludesSet[analyzer.Name]; !isExcluded {
+			analyzers = append(analyzers, analyzer)
+		}
+	}
+
+	return analyzers
+}
+
+var AnalyzerPlugin analyzerPlugin