Backport tools.go change to v1 (#1265)

* Use `go install` instead of tools.go

Previously, we were using tools.go to keep go.mod from changing during package installations. That is no longer needed.
This will help to clean up incompatible licenses. #1238

* Docs: fix broken links (#1041)

Update links to Kubernetes docs and examples.

* Enable links check and fix 2 links (#1259)


Co-authored-by: Neha Viswanathan <[email protected]>

Author: dak1n1

.go-version

@@ -1 +1 @@
-1.14.5
+1.16.0

.travis.yml

@@ -4,7 +4,7 @@ services:
   - docker
 language: go
 go:
-  - 1.14.x
+  - 1.16.x
 
 env:
   - GO111MODULE=on
@@ -27,7 +27,7 @@ script:
 
 branches:
   only:
-    - master
+    - main
 matrix:
   fast_finish: true
   allow_failures:

GNUmakefile

@@ -5,14 +5,18 @@ TEST         := "$(PROVIDER_DIR)/kubernetes"
 GOFMT_FILES  := $$(find $(PROVIDER_DIR) -name '*.go' |grep -v vendor)
 WEBSITE_REPO := github.com/hashicorp/terraform-website
 PKG_NAME     := kubernetes
+OS_ARCH      := $(shell go env GOOS)_$(shell go env GOARCH)
+TF_PROV_DOCS := $(PWD)/kubernetes/test-infra/tfproviderdocs
+EXT_PROV_DIR := $(PWD)/kubernetes/test-infra/external-providers
+EXT_PROV_BIN := /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH)/terraform-provider-kubernetes_9.9.9_$(OS_ARCH)
 
 ifneq ($(PWD),$(PROVIDER_DIR))
 $(error "Makefile must be run from the provider directory")
 endif
 
 default: build
 
-all: build depscheck fmtcheck test testacc test-compile tests-lint tests-lint-fix tools vet website-lint website-lint-fix
+all: build depscheck fmtcheck test test-update testacc test-compile tests-lint tests-lint-fix tools vet website-lint website-lint-fix
 
 build: fmtcheck
 	go install
@@ -29,6 +33,18 @@ depscheck:
 	@git diff --exit-code -- vendor || \
 		(echo; echo "Unexpected difference in vendor/ directory. Run 'go mod vendor' command or revert any go.mod/go.sum/vendor changes and commit."; exit 1)
 
+examples-lint: tools
+	@echo "==> Checking _examples dir formatting..."
+	@./scripts/fmt-examples.sh || (echo; \
+		echo "Terraform formatting errors found in _examples dir."; \
+		echo "To see the full differences, run: ./scripts/fmt-examples.sh diff"; \
+		echo "To automatically fix the formatting, run 'make examples-lint-fix' and commit the changes."; \
+		exit 1)
+
+examples-lint-fix: tools
+	@echo "==> Fixing terraform formatting of _examples dir..."
+	@./scripts/fmt-examples.sh fix
+
 fmt:
 	gofmt -w $(GOFMT_FILES)
 
@@ -40,8 +56,13 @@ test: fmtcheck
 	echo $(TEST) | \
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
-testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+testacc: fmtcheck vet
+	rm -rf $(EXT_PROV_DIR)/.terraform $(EXT_PROV_DIR)/.terraform.lock.hcl || true
+	mkdir $(EXT_PROV_DIR)/.terraform
+	mkdir -p /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH) || true
+	ls $(EXT_PROV_BIN) || go build -o $(EXT_PROV_BIN)
+	cd $(EXT_PROV_DIR) && TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform terraform init -upgrade
+	TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
@@ -64,15 +85,21 @@ tests-lint-fix: tools
 	@find ./kubernetes -name "*_test.go" -exec sed -i ':a;N;$$!ba;s/fmt.Sprintf(`\n/fmt.Sprintf(`/g' '{}' \; # remove newlines for terrafmt
 	@terrafmt fmt -f ./kubernetes --pattern '*_test.go'
 
+test-update: fmtcheck vet
+	rm -rf $(EXT_PROV_DIR)/.terraform $(EXT_PROV_DIR)/.terraform.lock.hcl || true
+	mkdir $(EXT_PROV_DIR)/.terraform
+	mkdir -p /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH) || true
+	go clean -cache
+	go build -o /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH)/terraform-provider-kubernetes_9.9.9_$(OS_ARCH)
+	cd $(EXT_PROV_DIR) && TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform terraform init -upgrade
+	TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform TF_ACC=1 go test $(TEST) -v -run 'regression' $(TESTARGS)
+
 tools:
-	go install github.com/bflad/tfproviderdocs
-	go install github.com/client9/misspell/cmd/misspell
-	go install github.com/katbyte/terrafmt
-	go mod tidy
-	go mod vendor
-# TODO:
-# go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
-# go install github.com/golangci/golangci-lint/cmd/golangci-lint
+	go install github.com/client9/misspell/cmd/[email protected]
+	go install github.com/bflad/tfproviderlint/cmd/[email protected]
+	go install github.com/bflad/[email protected]
+	go install github.com/katbyte/[email protected]
+	go install github.com/golangci/golangci-lint/cmd/[email protected]
 
 vet:
 	@echo "go vet ."
@@ -118,17 +145,15 @@ website-lint: tools
 		echo "To automatically fix the formatting, run 'make website-lint-fix' and commit the changes."; \
 		exit 1)
 	@echo "==> Statically compiling provider for tfproviderdocs..."
-	@env CGO_ENABLED=0 GOOS=$$(go env GOOS) GOARCH=$$(go env GOARCH) go build -a -o terraform-providers-schema/terraform-provider-kubernetes
+	@env CGO_ENABLED=0 GOOS=$$(go env GOOS) GOARCH=$$(go env GOARCH) go build -a -o $(TF_PROV_DOCS)/terraform-provider-kubernetes
 	@echo "==> Getting provider schema for tfproviderdocs..."
-		@$(DOCKER) run $(DOCKER_RUN_OPTS) -v $(PROVIDER_DIR)/terraform-providers-schema:/workspace:$(DOCKER_VOLUME_OPTS) -w /workspace hashicorp/terraform:0.12.29 init
-		@$(DOCKER) run $(DOCKER_RUN_OPTS) -v $(PROVIDER_DIR)/terraform-providers-schema:/workspace:$(DOCKER_VOLUME_OPTS) -w /workspace hashicorp/terraform:0.12.29 providers schema -json > ./terraform-providers-schema/schema.json
+		@$(DOCKER) run $(DOCKER_RUN_OPTS) -v $(TF_PROV_DOCS):/workspace:$(DOCKER_VOLUME_OPTS) -w /workspace hashicorp/terraform:0.12.29 init
+		@$(DOCKER) run $(DOCKER_RUN_OPTS) -v $(TF_PROV_DOCS):/workspace:$(DOCKER_VOLUME_OPTS) -w /workspace hashicorp/terraform:0.12.29 providers schema -json > $(TF_PROV_DOCS)/schema.json
 	@echo "==> Running tfproviderdocs..."
-	@tfproviderdocs check -providers-schema-json terraform-providers-schema/schema.json -provider-name kubernetes
-	@rm -f terraform-providers-schema/schema.json terraform-providers-schema/terraform-provider-kubernetes
-#	@echo "==> Checking for broken links..."
-#@scripts/markdown-link-check.sh "$(DOCKER)" "$(DOCKER_RUN_OPTS)" "$(DOCKER_VOLUME_OPTS)" "$(PROVIDER_DIR)"
-# TODO: enable this check when links have been fixed.
-# https://github.com/hashicorp/terraform-provider-kubernetes/issues/990
+	@tfproviderdocs check -providers-schema-json $(TF_PROV_DOCS)/schema.json -provider-name kubernetes
+	@rm -f $(TF_PROV_DOCS)/schema.json $(TF_PROV_DOCS)/terraform-provider-kubernetes
+	@echo "==> Checking for broken links..."
+	@scripts/markdown-link-check.sh "$(DOCKER)" "$(DOCKER_RUN_OPTS)" "$(DOCKER_VOLUME_OPTS)" "$(PROVIDER_DIR)"
 
 website-lint-fix: tools
 	@echo "==> Applying automatic website linter fixes..."
@@ -139,4 +164,3 @@ website-lint-fix: tools
 	@terrafmt fmt ./website --pattern '*.markdown'
 
 .PHONY: build test testacc tools vet fmt fmtcheck terrafmt test-compile depscheck tests-lint tests-lint-fix website-lint website-lint-fix
-

README.md

@@ -22,7 +22,7 @@ Please note: We take Terraform's security and our users' trust very seriously. I
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.12.x
     - Note that version 0.11.x currently works, but is [deprecated](https://www.hashicorp.com/blog/deprecating-terraform-0-11-support-in-terraform-providers/)
--	[Go](https://golang.org/doc/install) 1.14.x (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) 1.16.x (to build the provider plugin)
 
 
 ## Kubernetes Alpha Provider

go.mod

@@ -5,30 +5,20 @@ require (
 	github.com/Azure/go-autorest/autorest v0.11.6 // indirect
 	github.com/Azure/go-autorest/autorest/azure/cli v0.4.1 // indirect
 	github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
-	github.com/Djarvur/go-err113 v0.1.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/aws/aws-sdk-go v1.34.21 // indirect
-	github.com/bflad/tfproviderdocs v0.7.0
-	github.com/bflad/tfproviderlint v0.18.0
-	github.com/bmatcuk/doublestar v1.3.2 // indirect
-	github.com/client9/misspell v0.3.4
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
 	github.com/emicklei/go-restful v2.14.2+incompatible // indirect
 	github.com/go-logr/logr v0.2.1 // indirect
 	github.com/go-openapi/jsonreference v0.19.4 // indirect
 	github.com/go-openapi/spec v0.19.9 // indirect
 	github.com/go-openapi/swag v0.19.9 // indirect
-	github.com/golangci/golangci-lint v1.31.0
-	github.com/golangci/misspell v0.3.5 // indirect
-	github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect
 	github.com/google/go-cmp v0.5.2
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/googleapis/gnostic v0.5.1 // indirect
-	github.com/gookit/color v1.2.9 // indirect
-	github.com/gostaticanalysis/analysisutil v0.2.1 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/go-hclog v0.14.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
@@ -43,32 +33,22 @@ require (
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
-	github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b
 	github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
-	github.com/magiconair/properties v1.8.2 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e // indirect
 	github.com/mitchellh/cli v1.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
 	github.com/oklog/run v1.1.0 // indirect
-	github.com/pelletier/go-toml v1.8.0 // indirect
+	github.com/onsi/ginkgo v1.13.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
-	github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c // indirect
 	github.com/robfig/cron v1.2.0
 	github.com/spf13/afero v1.3.5 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/objx v0.3.0 // indirect
-	github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
 	github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200807230610-d5346d47e3af
 	github.com/terraform-providers/terraform-provider-azurerm v1.44.1-0.20200911233120-57b2bfc9d42c
 	github.com/terraform-providers/terraform-provider-random v1.3.2-0.20190925210718-83518d96ae4f // indirect
-	github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect
 	github.com/zclconf/go-cty v1.6.1 // indirect
 	github.com/zclconf/go-cty-yaml v1.0.2 // indirect
@@ -81,7 +61,6 @@ require (
 	google.golang.org/api v0.31.0 // indirect
 	google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f // indirect
 	google.golang.org/grpc v1.32.0 // indirect
-	gopkg.in/ini.v1 v1.61.0 // indirect
 	k8s.io/api v0.19.1
 	k8s.io/apimachinery v0.19.1
 	k8s.io/client-go v11.0.0+incompatible
@@ -90,8 +69,6 @@ require (
 	k8s.io/kube-openapi v0.0.0-20200831175022-64514a1d5d59 // indirect
 	k8s.io/kubectl v0.19.1
 	k8s.io/utils v0.0.0-20200821003339-5e75c0163111 // indirect
-	mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d // indirect
-	mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 // indirect
 )
 
 // kustomize needs to be kept in sync with the cli-runtime.