This is an automated cherry-pick of tikv#4934

close tikv#4932

Signed-off-by: ti-chi-bot <[email protected]>

Makefile

@@ -48,7 +48,7 @@ ifneq "$(PD_EDITION)" "Enterprise"
 endif
 endif
 
-ifneq ($(SWAGGER), 0)
+ifeq ($(SWAGGER), 1)
 	BUILD_TAGS += swagger_server
 endif
 
@@ -98,7 +98,7 @@ build: pd-server pd-ctl pd-recover
 tools: pd-tso-bench pd-analysis pd-heartbeat-bench
 
 PD_SERVER_DEP :=
-ifneq ($(SWAGGER), 0)
+ifeq ($(SWAGGER), 1)
 	PD_SERVER_DEP += swagger-spec
 endif
 ifneq ($(DASHBOARD_DISTRIBUTION_DIR),)
@@ -146,6 +146,7 @@ dashboard-replace-distro-info:
 	rm -f pkg/dashboard/distro/distro_info.go
 	cp $(DASHBOARD_DISTRIBUTION_DIR)/distro_info.go pkg/dashboard/distro/distro_info.go
 
+<<<<<<< HEAD
 # Tools
 pd-ctl: export GO111MODULE=on
 pd-ctl:
@@ -162,6 +163,84 @@ pd-analysis:
 pd-heartbeat-bench: export GO111MODULE=on
 pd-heartbeat-bench:
 	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-heartbeat-bench tools/pd-heartbeat-bench/main.go
+=======
+.PHONY: swagger-spec dashboard-ui dashboard-replace-distro-info
+
+#### Static tools ####
+
+PD_PKG := github.com/tikv/pd
+PACKAGES := $(shell go list ./...)
+
+GO_TOOLS_BIN_PATH := $(shell pwd)/.tools/bin
+PATH := $(GO_TOOLS_BIN_PATH):$(PATH)
+SHELL := env PATH='$(PATH)' GOBIN='$(GO_TOOLS_BIN_PATH)' $(shell which bash)
+
+install-tools:
+	@mkdir -p $(GO_TOOLS_BIN_PATH)
+	@which golangci-lint >/dev/null 2>&1 || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_TOOLS_BIN_PATH) v1.46.0
+	@grep '_' tools.go | sed 's/"//g' | awk '{print $$2}' | xargs go install
+
+.PHONY: install-tools
+
+#### Static checks ####
+
+check: install-tools static tidy check-plugin errdoc check-testing-t
+
+static: install-tools
+	@ echo "gofmt ..."
+	@ gofmt -s -l -d $(PACKAGE_DIRECTORIES) 2>&1 | awk '{ print } END { if (NR > 0) { exit 1 } }'
+	@ echo "golangci-lint ..."
+	@ golangci-lint run $(PACKAGE_DIRECTORIES)
+	@ echo "revive ..."
+	@ revive -formatter friendly -config revive.toml $(PACKAGES)
+
+	@ for mod in $(SUBMODULES); do cd $$mod && $(MAKE) static && cd - > /dev/null; done
+
+tidy:
+	@ go mod tidy
+	git diff go.mod go.sum | cat
+	git diff --quiet go.mod go.sum
+
+	@ for mod in $(SUBMODULES); do cd $$mod && $(MAKE) tidy && cd - > /dev/null; done
+
+check-plugin:
+	@echo "checking plugin"
+	cd ./plugin/scheduler_example && $(MAKE) evictLeaderPlugin.so && rm evictLeaderPlugin.so
+
+errdoc: install-tools
+	@echo "generator errors.toml"
+	./scripts/check-errdoc.sh
+
+check-testing-t:
+	./scripts/check-testing-t.sh
+
+.PHONY: check static tidy check-plugin errdoc docker-build-test check-testing-t
+
+#### Test utils ####
+
+FAILPOINT_ENABLE  := $$(find $$PWD/ -type d | grep -vE "\.git" | xargs failpoint-ctl enable)
+FAILPOINT_DISABLE := $$(find $$PWD/ -type d | grep -vE "\.git" | xargs failpoint-ctl disable)
+
+failpoint-enable: install-tools
+	# Converting failpoints...
+	@$(FAILPOINT_ENABLE)
+
+failpoint-disable: install-tools
+	# Restoring failpoints...
+	@$(FAILPOINT_DISABLE)
+
+.PHONY: failpoint-enable failpoint-disable
+
+#### Test ####
+
+PACKAGE_DIRECTORIES := $(subst $(PD_PKG)/,,$(PACKAGES))
+TEST_PKGS := $(filter $(shell find . -iname "*_test.go" -exec dirname {} \; | \
+                     sort -u | sed -e "s/^\./github.com\/tikv\/pd/"),$(PACKAGES))
+BASIC_TEST_PKGS := $(filter-out $(PD_PKG)/tests%,$(TEST_PKGS))
+
+SUBMODULES := $(filter $(shell find . -iname "go.mod" -exec dirname {} \;),\
+				$(filter-out .,$(shell find . -iname "Makefile" -exec dirname {} \;)))
+>>>>>>> 2cced16d4 (Makefile: disable swagger server (#4934))
 
 test: install-go-tools
 	# testing all pkgs...

client/Makefile

@@ -0,0 +1,42 @@
+# Copyright 2022 TiKV Project Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GO_TOOLS_BIN_PATH := $(shell pwd)/../.tools/bin
+PATH := $(GO_TOOLS_BIN_PATH):$(PATH)
+SHELL := env PATH='$(PATH)' GOBIN='$(GO_TOOLS_BIN_PATH)' $(shell which bash)
+
+default: static tidy test
+
+test:
+	CGO_ENABLE=1 go test -race -cover
+
+basic-test:
+	CGO_ENABLE=1 go test
+
+ci-test-job:
+	CGO_ENABLED=1 go test -race -covermode=atomic -coverprofile=covprofile -coverpkg=../... github.com/tikv/pd/client
+
+install-tools:
+	cd .. && $(MAKE) install-tools
+
+static: install-tools
+	@ gofmt -s -l -d . 2>&1 | awk '{ print } END { if (NR > 0) { exit 1 } }'
+	@ golangci-lint run -c ../.golangci.yml ./...
+	@ revive -formatter friendly -config ../revive.toml .
+
+tidy:
+	@ go mod tidy
+	git diff go.mod go.sum | cat
+	git diff --quiet go.mod go.sum
+

go.mod

@@ -5,7 +5,6 @@ go 1.16
 require (
 	github.com/AlekSi/gocov-xml v1.0.0
 	github.com/BurntSushi/toml v0.3.1
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/aws/aws-sdk-go v1.35.3
 	github.com/axw/gocov v1.0.0
 	github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5

go.sum

@@ -24,7 +24,6 @@ github.com/VividCortex/mysqlerr v1.0.0/go.mod h1:xERx8E4tBhLvpjzdUyQiSfUxeMcATEQ
 github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502 h1:L8IbaI/W6h5Cwgh0n4zGeZpVK78r/jBf9ASurHo9+/o=
 github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502/go.mod h1:pmnBM9bxWSiHvC/gSWunUIyDvGn33EkP2CUjxFKtTTM=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=

pkg/swaggerserver/empty_handler.go

@@ -24,6 +24,6 @@ import (
 
 func handler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_, _ = io.WriteString(w, "Swagger UI is not built. Try `make` without `SWAGGER=0`.\n")
+		_, _ = io.WriteString(w, "Swagger UI is not built. Try `make` without `SWAGGER=1`.\n")
 	})
 }

tests/client/Makefile

@@ -0,0 +1,51 @@
+# Copyright 2022 TiKV Project Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GO_TOOLS_BIN_PATH := $(shell pwd)/../../.tools/bin
+PATH := $(GO_TOOLS_BIN_PATH):$(PATH)
+SHELL := env PATH='$(PATH)' GOBIN='$(GO_TOOLS_BIN_PATH)' $(shell which bash)
+
+static: install-tools
+	@ gofmt -s -l -d . 2>&1 | awk '{ print } END { if (NR > 0) { exit 1 } }'
+	@ golangci-lint run ./...
+	@ revive -formatter friendly -config ../../revive.toml .
+
+tidy:
+	@ go mod tidy
+	git diff go.mod go.sum | cat
+	git diff --quiet go.mod go.sum
+
+test: enable-codegen dashboard-ui
+	CGO_ENABLED=1 go test -tags deadlock -race -cover || { $(MAKE) disable-codegen && exit 1; }
+	$(MAKE) disable-codegen
+
+basic-test:
+	# skip
+
+ci-test-job: enable-codegen
+	CGO_ENABLED=1 go test -tags deadlock -race -covermode=atomic -coverprofile=covprofile -coverpkg=../../... github.com/tikv/pd/tests/client
+
+install-tools:
+	cd ../../ && $(MAKE) install-tools
+
+enable-codegen:
+	cd ../../ && $(MAKE) failpoint-enable
+	go mod tidy
+
+disable-codegen:
+	cd ../../ && $(MAKE) failpoint-disable
+	go mod tidy
+
+dashboard-ui:
+	cd ../../ && $(MAKE) dashboard-ui