E2E tests execution on Windows

.github/workflows/build.yaml

@@ -62,8 +62,10 @@ jobs:
         make lint
 
     - name: Run make verify
+      if: runner.os != 'Windows'
       run: |
         make verify
+
 
     - name: Cross build
       run: |

.github/workflows/cli_core_e2e_windows_test_msys2.yaml

@@ -0,0 +1,119 @@
+name: Windows-MSYS2
+
+on:
+  pull_request:
+    branches: [main, release-*]
+  push:
+    branches: [main, test*, release-*]
+
+jobs:
+  build:
+    name: MSYS2 Tanzu CLI Core E2E Tests on Windows
+    runs-on: windows-latest
+
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Set TOPLEVEL_DIR environment variable
+        run: echo "TOPLEVEL_DIR=$(git rev-parse --show-toplevel)" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Verify Docker Desktop is running
+        run: |
+          docker --version
+          docker-compose --version
+          # Add additional steps as needed
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.18'  # Ensure version is a string
+        id: go
+
+      - name: go cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ steps.go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-${{ steps.go.outputs.go-version }}-
+
+      - name: Set and Echo GOPATH and GOBIN
+        run: |
+          $GOPATH = go env GOPATH
+          $GOBIN = "$GOPATH\bin"
+          echo "GOPATH 1 is set to $GOPATH"
+          echo "GOBIN 1 is set to $GOBIN"
+          echo "GOPATH=$GOPATH" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "GOBIN=$GOBIN" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "GOPATH 2 is set to $GOPATH"
+          echo "GOBIN 2 is set to $GOBIN"
+        shell: pwsh
+
+      - name: Echo Go installation path
+        run: |
+          echo "Go installation path: $(go env GOROOT)"
+          ls "$(go env GOROOT)"
+          ls "$(go env GOROOT)\bin"
+        shell: bash
+
+      - name: Echo GOPATH and GOBIN
+        run: |
+          echo "GOPATH=$env:GOPATH"
+          echo "GOBIN=$env:GOBIN"
+          echo "Contents of GOPATH:"
+          Get-ChildItem -Path $env:GOPATH
+          echo "Contents of GOBIN:"
+          Get-ChildItem -Path $env:GOBIN
+        shell: pwsh
+
+      - name: Install MSYS2
+        run: choco install msys2
+        shell: powershell
+
+      - name: Initialize MSYS2
+        run: C:\tools\msys64\usr\bin\bash -lc "echo 'Hello from MSYS2'"
+        shell: powershell
+
+      - name: Install Make and Unzip in MSYS2
+        run: |
+          C:\tools\msys64\usr\bin\bash -lc "pacman -S make unzip --noconfirm"
+          C:\tools\msys64\usr\bin\bash -lc "pacman -S make wget --noconfirm"
+          C:\tools\msys64\usr\bin\bash -lc "pacman -S make bzip2 --noconfirm"
+          C:\tools\msys64\usr\bin\bash -lc "wget --version"
+          C:\tools\msys64\usr\bin\bash -lc "bzip2 --version"
+        shell: powershell
+
+      - name: Run Unix Commands in MSYS2
+        run: |
+          C:\tools\msys64\usr\bin\bash -lc "echo 'Hello from MSYS2'"
+          C:\tools\msys64\usr\bin\bash -lc "ls"
+          C:\tools\msys64\usr\bin\bash -lc "pwd"
+          C:\tools\msys64\usr\bin\bash -lc "wget --version"
+          C:\tools\msys64\usr\bin\bash -lc "bzip2 --version"
+          $WGET = $(Get-Command wget).Source
+          $BZIP2 = $(Get-Command bzip2).Source
+          echo "WGET_PATH=$WGET" >> $env:GITHUB_ENV
+          echo "BZIP2_PATH=$BZIP2" >> $env:GITHUB_ENV
+          echo "WGET_PATH: $WGET"
+          echo "BZIP2_PATH: $BZIP2"
+          $msysBin = "C:\tools\msys64\usr\bin"
+          echo "MSYS_BIN=$msysBin" >> $env:GITHUB_ENV
+          echo "PATH info: $env:PATH"
+          echo "PATH info2: $PATH"
+        shell: powershell
+
+      - name: Build CLI Core
+        run: |
+          make build
+        shell: powershell
+
+      - name: E2E Tests
+        run: |
+          C:\tools\msys64\usr\bin\bash -lc "wget --version"
+          C:\tools\msys64\usr\bin\bash -lc "bzip2 --version"
+          make e2e-cli-core
+        shell: powershell

Makefile

@@ -5,11 +5,12 @@ include ./plugin-tooling.mk
 include ./test/e2e/Makefile
 
 # Ensure Make is run with bash shell as some syntax below is bash-specific
-SHELL := /usr/bin/env bash
 
 ROOT_DIR := $(shell git rev-parse --show-toplevel)
+ROOT_DIR := $(subst \,/,$(ROOT_DIR))
 ARTIFACTS_DIR ?= $(ROOT_DIR)/artifacts
 
+HOME := $(subst \,/,$(HOME))
 XDG_CONFIG_HOME := ${HOME}/.config
 export XDG_CONFIG_HOME
 
@@ -18,6 +19,28 @@ GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOHOSTOS ?= $(shell go env GOHOSTOS)
 GOHOSTARCH ?= $(shell go env GOHOSTARCH)
+HOST_OS=$(shell go env GOOS)
+
+WGET := $(shell which wget)
+BZIP2 := $(shell which bzip2) 
+TAR := $(shell which tar)
+
+# Load environment variables from GitHub workflow
+ifeq ($(GITHUB_ACTIONS),true)
+	ifeq ($(GOOS),windows)
+		# Use the values from GitHub Actions
+		MSYS_BIN ?= $(shell echo $MSYS_BIN)
+		WGET = $(MSYS_BIN)/wget
+		BZIP2 = $(MSYS_BIN)/bzip2
+		TAR = $(MSYS_BIN)/tar
+	endif
+endif
+
+# Ensure $(GOPATH) uses forward slashes
+WGET := $(subst \,/,$(WGET))
+BZIP2 := $(subst \,/,$(BZIP2))
+TAR := $(subst \,/,$(TAR))
+
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -30,8 +53,9 @@ GO := go
 GOTEST_VERBOSE ?= -v
 
 # Directories
+BIN_DIR := $(shell echo "bin")
 TOOLS_DIR := $(abspath $(ROOT_DIR)/hack/tools)
-TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
+TOOLS_BIN_DIR := $(TOOLS_DIR)/$(BIN_DIR)
 
 # Add tooling binaries here and in hack/tools/Makefile
 GOIMPORTS          := $(TOOLS_BIN_DIR)/goimports
@@ -51,7 +75,10 @@ GOJUNITREPORT      := $(TOOLS_BIN_DIR)/go-junit-report
 VENDIR             := $(TOOLS_BIN_DIR)/vendir
 YQ                 := $(TOOLS_BIN_DIR)/yq
 
-TOOLING_BINARIES   := $(GOIMPORTS) $(GOLANGCI_LINT) $(VALE) $(MISSPELL) $(CONTROLLER_GEN) $(IMGPKG) $(KUBECTL) $(KIND) $(GINKGO) $(COSIGN) $(GOJUNITREPORT) $(KCTRL) $(YTT) $(KBLD) $(VENDIR) $(YQ)
+TOOLING_BINARIES   := $(GOIMPORTS) $(GOLANGCI_LINT) $(VALE) $(MISSPELL) $(CONTROLLER_GEN) $(IMGPKG) $(KUBECTL) $(KIND) $(GINKGO) $(COSIGN) $(GOJUNITREPORT)
+#TOOLING_BINARIES   := $(GOIMPORTS) $(GOLANGCI_LINT) $(VALE) $(MISSPELL) $(CONTROLLER_GEN) $(IMGPKG) $(KUBECTL) $(KIND) $(GINKGO) $(COSIGN) $(GOJUNITREPORT)
+#TOOLING_BINARIES   := $(VALE) $(GOLANGCI_LINT) $(GOIMPORTS)
+
 
 # Build and version information
 
@@ -103,6 +130,11 @@ CLI_TARGETS := $(addprefix build-cli-,${ENVS})
 help: ## Display this help (default)
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[0-9a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-28s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m\033[32m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
+tools: $(TOOLING_BINARIES) ## Build tooling binaries
+.PHONY: $(TOOLING_BINARIES)
+$(TOOLING_BINARIES):
+	make -C $(TOOLS_DIR) $(@F)
+
 ## --------------------------------------
 ## All
 ## --------------------------------------
@@ -137,17 +169,20 @@ build-cli-%: ##Build the Tanzu Core CLI for a platform
 
 	@echo build $(OS)-$(ARCH) CLI with version: $(BUILD_VERSION)
 
-	@if [ "$(filter $(OS)-$(ARCH),$(ENVS))" = "" ]; then\
-		printf "\n\n======================================\n";\
-		printf "! $(OS)-$(ARCH) is not an officially supported platform!\n";\
-		printf "======================================\n\n";\
-	fi
+	@mkdir -p artifacts/$(OS)/$(ARCH)/cli/core/$(BUILD_VERSION)
+
+	@echo "Listing artifacts directory:"
+	@ls artifacts
+
+	@echo "BEfore build"
+	@echo "Windows build"
+	@pwd
+	@cd cmd/tanzu
+	@pwd
+	@go build -o $(ARTIFACTS_DIR)/$(OS)/$(ARCH)/cli/core/$(BUILD_VERSION)/tanzu-cli-$(OS)_$(ARCH).exe cmd/tanzu/main.go
+	@ls cmd/tanzu
+	@ls $(ARTIFACTS_DIR)/$(OS)/$(ARCH)/cli/core/$(BUILD_VERSION)
 
-	@if [ "$(OS)" = "windows" ]; then \
-		GOOS=$(OS) GOARCH=$(ARCH) $(GO) build -gcflags=all="-l" --ldflags "$(LD_FLAGS)" -o "$(ARTIFACTS_DIR)/$(OS)/$(ARCH)/cli/core/$(BUILD_VERSION)/tanzu-cli-$(OS)_$(ARCH).exe" ./cmd/tanzu/main.go;\
-	else \
-		GOOS=$(OS) GOARCH=$(ARCH) $(GO) build -gcflags=all="-l" --ldflags "$(LD_FLAGS)" -o "$(ARTIFACTS_DIR)/$(OS)/$(ARCH)/cli/core/$(BUILD_VERSION)/tanzu-cli-$(OS)_$(ARCH)" ./cmd/tanzu/main.go;\
-	fi
 
 ## --------------------------------------
 ## Plugins-specific
@@ -245,11 +280,15 @@ test-with-summary-report: tools
 	rm ./make_test.output ./test_suite_output.json ./CLI-ginkgo-tests-summary.txt ./CLI-junit-report.xml
 
 .PHONY: e2e-cli-core ## Execute all CLI Core E2E Tests
-e2e-cli-core: tools crd-package-for-test start-test-central-repo start-airgapped-local-registry e2e-cli-core-all ## Execute all CLI Core E2E Tests
+#e2e-cli-core: tools crd-package-for-test start-test-central-repo start-airgapped-local-registry e2e-cli-core-all ## Execute all CLI Core E2E Tests
+e2e-cli-core:  start-test-central-repo  ## Execute all CLI Core E2E Tests
+#e2e-cli-core: tools e2e-cli-core-all ## Execute all CLI Core E2E Tests
+
 
 .PHONY: setup-custom-cert-for-test-central-repo
 setup-custom-cert-for-test-central-repo: ## Setup up the custom ca cert for test-central-repo in the config file
 	@if [ ! -d $(ROOT_DIR)/hack/central-repo/certs ]; then \
+		echo "Downloading test central repo certs";\
     	wget https://storage.googleapis.com/tanzu-cli/data/testcerts/local-central-repo-testcontent.bz2 -O $(ROOT_DIR)/hack/central-repo/local-central-repo-testcontent.bz2;\
   		tar xjf $(ROOT_DIR)/hack/central-repo/local-central-repo-testcontent.bz2 -C $(ROOT_DIR)/hack/central-repo/;\
 	fi
@@ -262,7 +301,40 @@ start-test-central-repo: stop-test-central-repo setup-custom-cert-for-test-centr
 	@if [ ! -d $(ROOT_DIR)/hack/central-repo/registry-content ]; then \
 		(cd $(ROOT_DIR)/hack/central-repo && tar xjf registry-content.bz2 || true;) \
 	fi
-	@docker run --rm -d -p 9876:443 --name central \
+	echo "Starting docker test central repo with images:"
+	@echo "docker run -d -p 9876:443 --name central \
+		-v $(ROOT_DIR)/hack/central-repo/certs:/certs \
+		-e REGISTRY_HTTP_ADDR=0.0.0.0:443  \
+		-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/localhost.crt  \
+		-e REGISTRY_HTTP_TLS_KEY=/certs/localhost.key  \
+		-v $(ROOT_DIR)/hack/central-repo/registry-content:/var/lib/registry \
+		$(REGISTRY_IMAGE)"
+	export MSYS_NO_PATHCONV=1
+	docker run -d -p 9876:443 --name central \
+		-v $(ROOT_DIR)/hack/central-repo/certs:/certs \
+		-e REGISTRY_HTTP_ADDR=0.0.0.0:443  \
+		-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/localhost.crt  \
+		-e REGISTRY_HTTP_TLS_KEY=/certs/localhost.key  \
+		-v $(ROOT_DIR)/hack/central-repo/registry-content:/var/lib/registry \
+		$(REGISTRY_IMAGE) > /dev/null && \
+		echo "Started docker test central repo with images:" && \
+		$(ROOT_DIR)/hack/central-repo/upload-plugins.sh info
+
+.PHONY: start-test-central-repo33
+start-test-central-repo33: ## Starts up a test central repository locally with docker
+	@if [ ! -d $(ROOT_DIR)/hack/central-repo/registry-content ]; then \
+		(cd $(ROOT_DIR)/hack/central-repo && tar xjf registry-content.bz2 || true;) \
+	fi
+	echo "Starting docker test central repo with images:"
+	@echo "docker run -d -p 9876:443 --name central \
+		-v $(ROOT_DIR)/hack/central-repo/certs:/certs \
+		-e REGISTRY_HTTP_ADDR=0.0.0.0:443  \
+		-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/localhost.crt  \
+		-e REGISTRY_HTTP_TLS_KEY=/certs/localhost.key  \
+		-v $(ROOT_DIR)/hack/central-repo/registry-content:/var/lib/registry \
+		$(REGISTRY_IMAGE)"
+	export MSYS_NO_PATHCONV=1
+	docker run -d -p 9876:443 --name central \
 		-v $(ROOT_DIR)/hack/central-repo/certs:/certs \
 		-e REGISTRY_HTTP_ADDR=0.0.0.0:443  \
 		-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/localhost.crt  \
@@ -284,11 +356,11 @@ start-airgapped-local-registry: stop-airgapped-local-registry
 
 	@mkdir -p $(ROOT_DIR)/hack/central-repo/auth && docker run --entrypoint htpasswd httpd:2 -Bbn ${TANZU_CLI_E2E_AIRGAPPED_REPO_WITH_AUTH_USERNAME} ${TANZU_CLI_E2E_AIRGAPPED_REPO_WITH_AUTH_PASSWORD} > $(ROOT_DIR)/hack/central-repo/auth/htpasswd
 	@docker run --rm -d -p 6002:5000 --name temp-airgapped-local-registry-with-auth \
-		-v $(ROOT_DIR)/hack/central-repo/auth:/auth \
+		-v "D:\a\tanzu-cli\tanzu-cli\hack\central-repo\auth:C:\auth" \
 		-e "REGISTRY_AUTH=htpasswd" \
 		-e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-		-e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-		$(REGISTRY_IMAGE) > /dev/null && \
+		-e "REGISTRY_AUTH_HTPASSWD_PATH=C:\auth\htpasswd" \
+		stefanscherer/registry-windows:latest > /dev/null && \
 		echo "Started docker test airgapped repo with authentication at 'localhost:6002'."
 
 	@docker logout localhost:6002 || true
@@ -363,10 +435,7 @@ generate: generate-controller-code generate-manifests 	## Generate controller co
 ## Tooling Binaries
 ## --------------------------------------
 
-tools: $(TOOLING_BINARIES) ## Build tooling binaries
-.PHONY: $(TOOLING_BINARIES)
-$(TOOLING_BINARIES):
-	make -C $(TOOLS_DIR) $(@F)
+
 
 .PHONY: clean-tools
 clean-tools:

Makefile.bat

@@ -0,0 +1,5 @@
+
+:test
+test: fmt ## Run Tests
+	go test `go list ./... | grep -v test/e2e | grep -v test/coexistence` -timeout 60m -race -coverprofile coverage.txt ${GOTEST_VERBOSE}
+goto :EOF

go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/vmware-tanzu/tanzu-framework/capabilities/client v0.0.0-20230523145612-1c6fbba34686
 	github.com/vmware-tanzu/tanzu-plugin-runtime v1.2.0-dev.0.20240206192120-055fd83cf63d
 	go.pinniped.dev v0.20.0
-	golang.org/x/mod v0.12.0
+	golang.org/x/mod v0.15.0
 	golang.org/x/oauth2 v0.8.0
 	golang.org/x/sync v0.3.0
 	golang.org/x/term v0.15.0
@@ -218,10 +218,10 @@ require (
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect

go.sum

@@ -815,8 +815,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -940,8 +940,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -982,8 +982,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=