From 766f86a189d8088e555f6f085d09108c6f2e18e1 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Fri, 5 Aug 2022 10:32:47 -0700
Subject: [PATCH] Remove metalinter, slightly rework build+test rule (#12259)

---
 .github/workflows/go.yml |  8 +++++---
 GNUmakefile              | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9eae22a88bd..665e43f71b4 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -23,11 +23,13 @@ jobs:
 
     - name: Get dependencies
       run: |
-        go get
-        make tools
+        go mod download
 
     - name: Build
-      run: go build
+      run: |
+        make lint
+        make generate
+        go build
 
     - name: Test
       run: |
diff --git a/GNUmakefile b/GNUmakefile
index 737fa1c3d2b..aa2b29a6b5c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,13 +5,13 @@ DIR_NAME=google
 
 default: build
 
-build: fmtcheck generate
+build: lint generate
 	go install
 
-test: fmtcheck generate
+test: lint generate
 	go test $(TESTARGS) -timeout=30s $(TEST)
 
-testacc: fmtcheck generate
+testacc: generate
 	TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test $(TEST) -v $(TESTARGS) -timeout 240m -ldflags="-X=github.com/hashicorp/terraform-provider-google/version.ProviderVersion=acc"
 
 fmt:
@@ -20,18 +20,12 @@ fmt:
 
 # Currently required by tf-deploy compile
 fmtcheck:
-	@echo "==> Checking source code against gofmt..."
-	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
+	sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 
-lint:
-	@echo "==> Checking source code against linters..."
-	@GOGC=off golangci-lint run -v ./$(DIR_NAME)
-
-tools:
-	@echo "==> installing required tooling..."
-	go install github.com/client9/misspell/cmd/misspell@latest
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+vet:
+	go vet
 
+lint: fmtcheck vet
 
 generate:
 	go generate  ./...
@@ -54,4 +48,4 @@ endif
 docscheck:
 	@sh -c "'$(CURDIR)/scripts/docscheck.sh'"
 
-.PHONY: build test testacc vet fmt fmtcheck lint tools errcheck test-compile website website-test docscheck generate
+.PHONY: build test testacc fmt fmtcheck vet lint test-compile website website-test docscheck generate