From 7b484e7b9dc34401d8bdd04db260ed8ecadb9e68 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 08:58:46 +0200
Subject: [PATCH 01/11] Applying goimports before checking sizegen to reduce
 import-related errors

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 tools/check_make_sizegen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/check_make_sizegen.sh b/tools/check_make_sizegen.sh
index edcff23a5e3..787ed43da49 100755
--- a/tools/check_make_sizegen.sh
+++ b/tools/check_make_sizegen.sh
@@ -13,6 +13,8 @@ ALL_FILES=$(find . -name "cached_size.go")
 
 set +e
 
+goimports -local vitess.io/vitess -w $ALL_FILES
+
 for SRC in $ALL_FILES
 do
   TMP="/tmp/"$(echo "$SRC" | sed 's/\//_/g' | sed "s/cached_size.go/cached_size_$$.go/g")

From 43124d09ed4b7072ff2526a0a5cffff275d3f906 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 09:23:38 +0200
Subject: [PATCH 02/11] Apply goimports

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 go/tools/sizegen/integration/cached_size.go | 1 +
 go/vt/vtgate/engine/cached_size.go          | 1 +
 go/vt/vtgate/vindexes/cached_size.go        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/go/tools/sizegen/integration/cached_size.go b/go/tools/sizegen/integration/cached_size.go
index a841d94f88b..6023b29b7e4 100644
--- a/go/tools/sizegen/integration/cached_size.go
+++ b/go/tools/sizegen/integration/cached_size.go
@@ -21,6 +21,7 @@ import (
 	"math"
 	"reflect"
 	"unsafe"
+
 	hack "vitess.io/vitess/go/hack"
 )
 
diff --git a/go/vt/vtgate/engine/cached_size.go b/go/vt/vtgate/engine/cached_size.go
index 380328449b5..a1db2e3f185 100644
--- a/go/vt/vtgate/engine/cached_size.go
+++ b/go/vt/vtgate/engine/cached_size.go
@@ -21,6 +21,7 @@ import (
 	"math"
 	"reflect"
 	"unsafe"
+
 	hack "vitess.io/vitess/go/hack"
 )
 
diff --git a/go/vt/vtgate/vindexes/cached_size.go b/go/vt/vtgate/vindexes/cached_size.go
index a22932e6155..10af44ae6b2 100644
--- a/go/vt/vtgate/vindexes/cached_size.go
+++ b/go/vt/vtgate/vindexes/cached_size.go
@@ -21,6 +21,7 @@ import (
 	"math"
 	"reflect"
 	"unsafe"
+
 	hack "vitess.io/vitess/go/hack"
 )
 

From 589b1d076e94b68cbae168419707105b67b11bb2 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 10:19:12 +0200
Subject: [PATCH 03/11] Apply goimport in TestFullGeneration while comparing
 jennifer and local files

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 go/tools/sizegen/sizegen.go | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/go/tools/sizegen/sizegen.go b/go/tools/sizegen/sizegen.go
index 3865ded5ca4..9372020ea67 100644
--- a/go/tools/sizegen/sizegen.go
+++ b/go/tools/sizegen/sizegen.go
@@ -23,6 +23,8 @@ import (
 	"go/types"
 	"io/ioutil"
 	"log"
+	"os"
+	"os/exec"
 	"path"
 	"sort"
 	"strings"
@@ -482,7 +484,9 @@ func main() {
 }
 
 // VerifyFilesOnDisk compares the generated results from the codegen against the files that
-// currently exist on disk and returns any mismatches
+// currently exist on disk and returns any mismatches. All the files generated by jennifer
+// are formatted using the goimports command. Any difference in the imports will also make
+// this test fail.
 func VerifyFilesOnDisk(result map[string]*jen.File) (errors []error) {
 	for fullPath, file := range result {
 		existing, err := ioutil.ReadFile(fullPath)
@@ -491,13 +495,39 @@ func VerifyFilesOnDisk(result map[string]*jen.File) (errors []error) {
 			continue
 		}
 
+		tempFile, err := ioutil.TempFile("/tmp", "*.go")
+		if err != nil {
+			errors = append(errors, fmt.Errorf("could not create a file: %w", err))
+			continue
+		}
+
 		var buf bytes.Buffer
 		if err := file.Render(&buf); err != nil {
 			errors = append(errors, fmt.Errorf("render error for '%s': %w", fullPath, err))
 			continue
 		}
 
-		if !bytes.Equal(existing, buf.Bytes()) {
+		_, err = tempFile.Write(buf.Bytes())
+		if err != nil {
+			errors = append(errors, fmt.Errorf("could not render with file: %w", err))
+			continue
+		}
+
+		cmd := exec.Command("goimports", "-local", "vitess.io/vitess", "-w", tempFile.Name())
+		cmd.Stderr = os.Stderr
+		err = cmd.Run()
+		if err != nil {
+			errors = append(errors, fmt.Errorf("goimport execution error: %w", err))
+			continue
+		}
+
+		newFileContent, err := ioutil.ReadFile(tempFile.Name())
+		if err != nil {
+			errors = append(errors, fmt.Errorf("missing file on disk: %s (%w)", tempFile.Name(), err))
+			continue
+		}
+
+		if !bytes.Equal(existing, newFileContent) {
 			errors = append(errors, fmt.Errorf("'%s' has changed", fullPath))
 			continue
 		}

From b7c668ff08ca6eae3f56c32ec5511e3f08671861 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 10:46:27 +0200
Subject: [PATCH 04/11] go get goimports in CI workflows

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/docker/cluster_test_vreplication_basic/Dockerfile    | 5 ++++-
 .../docker/cluster_test_vreplication_cellalias/Dockerfile    | 5 ++++-
 .../docker/cluster_test_vreplication_multicell/Dockerfile    | 5 ++++-
 .github/docker/cluster_test_vreplication_v2/Dockerfile       | 5 ++++-
 .github/docker/unit_test_mariadb103/Dockerfile               | 5 ++++-
 .github/docker/unit_test_mysql57/Dockerfile                  | 5 ++++-
 .github/workflows/cluster_endtoend_11.yml                    | 1 +
 .github/workflows/cluster_endtoend_12.yml                    | 1 +
 .github/workflows/cluster_endtoend_13.yml                    | 1 +
 .github/workflows/cluster_endtoend_14.yml                    | 1 +
 .github/workflows/cluster_endtoend_15.yml                    | 1 +
 .github/workflows/cluster_endtoend_16.yml                    | 1 +
 .github/workflows/cluster_endtoend_17.yml                    | 1 +
 .github/workflows/cluster_endtoend_18.yml                    | 1 +
 .github/workflows/cluster_endtoend_19.yml                    | 1 +
 .github/workflows/cluster_endtoend_20.yml                    | 1 +
 .github/workflows/cluster_endtoend_21.yml                    | 1 +
 .github/workflows/cluster_endtoend_22.yml                    | 1 +
 .github/workflows/cluster_endtoend_23.yml                    | 1 +
 .github/workflows/cluster_endtoend_24.yml                    | 1 +
 .github/workflows/cluster_endtoend_26.yml                    | 1 +
 .github/workflows/cluster_endtoend_mysql80.yml               | 1 +
 .github/workflows/cluster_endtoend_onlineddl_declarative.yml | 1 +
 .github/workflows/cluster_endtoend_onlineddl_ghost.yml       | 1 +
 .github/workflows/cluster_endtoend_onlineddl_revert.yml      | 1 +
 .github/workflows/cluster_endtoend_onlineddl_singleton.yml   | 1 +
 .github/workflows/cluster_endtoend_onlineddl_vrepl.yml       | 1 +
 .../workflows/cluster_endtoend_onlineddl_vrepl_stress.yml    | 1 +
 .../cluster_endtoend_onlineddl_vrepl_stress_suite.yml        | 1 +
 .github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml | 1 +
 .github/workflows/cluster_endtoend_resharding.yml            | 1 +
 .github/workflows/cluster_endtoend_resharding_bytes.yml      | 1 +
 .github/workflows/cluster_endtoend_tabletmanager_tablegc.yml | 1 +
 .../workflows/cluster_endtoend_tabletmanager_throttler.yml   | 1 +
 ...luster_endtoend_tabletmanager_throttler_custom_config.yml | 1 +
 .github/workflows/cluster_endtoend_vreplication_migrate.yml  | 1 +
 .github/workflows/cluster_endtoend_vstream_failover.yml      | 1 +
 .../cluster_endtoend_vstream_stoponreshard_false.yml         | 1 +
 .../cluster_endtoend_vstream_stoponreshard_true.yml          | 1 +
 .github/workflows/cluster_endtoend_vtgate_buffer.yml         | 1 +
 .github/workflows/cluster_endtoend_vtgate_concurrentdml.yml  | 1 +
 .github/workflows/cluster_endtoend_vtgate_gen4.yml           | 1 +
 .github/workflows/cluster_endtoend_vtgate_readafterwrite.yml | 1 +
 .github/workflows/cluster_endtoend_vtgate_reservedconn.yml   | 1 +
 .github/workflows/cluster_endtoend_vtgate_schema.yml         | 1 +
 .github/workflows/cluster_endtoend_vtgate_topo.yml           | 1 +
 .github/workflows/cluster_endtoend_vtgate_transaction.yml    | 1 +
 .github/workflows/cluster_endtoend_vtgate_unsharded.yml      | 1 +
 .github/workflows/cluster_endtoend_vtgate_vindex.yml         | 1 +
 .github/workflows/cluster_endtoend_vtgate_vschema.yml        | 1 +
 .github/workflows/cluster_endtoend_vtorc.yml                 | 1 +
 .github/workflows/cluster_endtoend_xb_recovery.yml           | 1 +
 .github/workflows/unit_test_mariadb102.yml                   | 1 +
 .github/workflows/unit_test_mysql80.yml                      | 1 +
 .github/workflows/unit_test_percona56.yml                    | 1 +
 test/templates/cluster_endtoend_test.tpl                     | 1 +
 test/templates/dockerfile.tpl                                | 5 ++++-
 test/templates/unit_test.tpl                                 | 1 +
 58 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/.github/docker/cluster_test_vreplication_basic/Dockerfile b/.github/docker/cluster_test_vreplication_basic/Dockerfile
index 603c3240e30..362f21a5ebf 100644
--- a/.github/docker/cluster_test_vreplication_basic/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_basic/Dockerfile
@@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
index 603c3240e30..362f21a5ebf 100644
--- a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
@@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_multicell/Dockerfile b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
index 603c3240e30..362f21a5ebf 100644
--- a/.github/docker/cluster_test_vreplication_multicell/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
@@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_v2/Dockerfile b/.github/docker/cluster_test_vreplication_v2/Dockerfile
index 603c3240e30..362f21a5ebf 100644
--- a/.github/docker/cluster_test_vreplication_v2/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_v2/Dockerfile
@@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/unit_test_mariadb103/Dockerfile b/.github/docker/unit_test_mariadb103/Dockerfile
index 0ebc71fbaf9..944e3f96cd0 100644
--- a/.github/docker/unit_test_mariadb103/Dockerfile
+++ b/.github/docker/unit_test_mariadb103/Dockerfile
@@ -30,5 +30,8 @@ RUN mkdir -p $VTDATAROOT
 # make tools
 RUN make tools
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/unit_test_mysql57/Dockerfile b/.github/docker/unit_test_mysql57/Dockerfile
index 61e43e741b6..0b8c2c5c0b5 100644
--- a/.github/docker/unit_test_mysql57/Dockerfile
+++ b/.github/docker/unit_test_mysql57/Dockerfile
@@ -30,5 +30,8 @@ RUN mkdir -p $VTDATAROOT
 # make tools
 RUN make tools
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/workflows/cluster_endtoend_11.yml b/.github/workflows/cluster_endtoend_11.yml
index debbe8207c0..091fc6d76ef 100644
--- a/.github/workflows/cluster_endtoend_11.yml
+++ b/.github/workflows/cluster_endtoend_11.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index 61173a3c4f9..d246e92bb24 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
index 0e23d2d6819..79fdc6627b4 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_14.yml b/.github/workflows/cluster_endtoend_14.yml
index 57170a068de..072573a7891 100644
--- a/.github/workflows/cluster_endtoend_14.yml
+++ b/.github/workflows/cluster_endtoend_14.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
index cdcd68486c6..c73e3d54c96 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_16.yml b/.github/workflows/cluster_endtoend_16.yml
index 187728bf257..6b00b6aae49 100644
--- a/.github/workflows/cluster_endtoend_16.yml
+++ b/.github/workflows/cluster_endtoend_16.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_17.yml b/.github/workflows/cluster_endtoend_17.yml
index 8eb67601454..50769c4c5be 100644
--- a/.github/workflows/cluster_endtoend_17.yml
+++ b/.github/workflows/cluster_endtoend_17.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 61efb160f98..9213ab4b2bb 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_19.yml b/.github/workflows/cluster_endtoend_19.yml
index 14e25bd3805..d91efc8ae61 100644
--- a/.github/workflows/cluster_endtoend_19.yml
+++ b/.github/workflows/cluster_endtoend_19.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_20.yml b/.github/workflows/cluster_endtoend_20.yml
index 0d12c6cf3f1..4197a724937 100644
--- a/.github/workflows/cluster_endtoend_20.yml
+++ b/.github/workflows/cluster_endtoend_20.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
index 47416c295f6..ba1cc3bd628 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml
index 1e732196d70..99b61dec27d 100644
--- a/.github/workflows/cluster_endtoend_22.yml
+++ b/.github/workflows/cluster_endtoend_22.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_23.yml b/.github/workflows/cluster_endtoend_23.yml
index 86a0a7e8f17..290edc8a801 100644
--- a/.github/workflows/cluster_endtoend_23.yml
+++ b/.github/workflows/cluster_endtoend_23.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_24.yml b/.github/workflows/cluster_endtoend_24.yml
index 822436ed637..63fadc882ba 100644
--- a/.github/workflows/cluster_endtoend_24.yml
+++ b/.github/workflows/cluster_endtoend_24.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml
index 95546aa9e66..0400d42b708 100644
--- a/.github/workflows/cluster_endtoend_26.yml
+++ b/.github/workflows/cluster_endtoend_26.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
index 70f88c7da3a..9c64eadea6c 100644
--- a/.github/workflows/cluster_endtoend_mysql80.yml
+++ b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
index 45809895f38..2f825d2d874 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
index 6f343511668..01cd1851993 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
index 66607f5c59a..8b54a70d21d 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
index e623f201186..966c20bde4b 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index 769740d54ee..e9aa5688df0 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index b5fa182cb7a..50cef4fd627 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index 69977d64f30..2d1f20bcfe7 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index c07fabb334e..e920ea9a8e7 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding.yml b/.github/workflows/cluster_endtoend_resharding.yml
index 3c32f1829b2..ed7b8166431 100644
--- a/.github/workflows/cluster_endtoend_resharding.yml
+++ b/.github/workflows/cluster_endtoend_resharding.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding_bytes.yml b/.github/workflows/cluster_endtoend_resharding_bytes.yml
index 979b2779de8..0de26eccaf2 100644
--- a/.github/workflows/cluster_endtoend_resharding_bytes.yml
+++ b/.github/workflows/cluster_endtoend_resharding_bytes.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index d894eb09566..0033c602f5d 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
index 1afadb07768..731f04a20e8 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
index af4956b3f52..6b66d80f4bd 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index 9e0d4065431..3f9f143c9bb 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_failover.yml b/.github/workflows/cluster_endtoend_vstream_failover.yml
index 82ef74998e4..57ca13811ae 100644
--- a/.github/workflows/cluster_endtoend_vstream_failover.yml
+++ b/.github/workflows/cluster_endtoend_vstream_failover.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
index 4394525ce87..4e99a3ed4e1 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
index 3bc82eb400f..c0bc32b3178 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_buffer.yml b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
index fb3843dc24c..2ef4b182d4c 100644
--- a/.github/workflows/cluster_endtoend_vtgate_buffer.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
index 9f68c8b2a1b..733b7d582ae 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index ce7f30c3778..17f4c8f6681 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index 4a6c0d743c4..17bef0aea00 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 3cbb89849a5..41027b795bd 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index f253af5fa1c..7aada9496e5 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index c98d48679cc..d72019f5db9 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index 9819f3cd43e..bd8b2c1b211 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index 0cab6566aad..dfc96f2e242 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex.yml b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
index de22e37d11f..7f91ed4135d 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
index d6d0dfdcfae..8517c163a79 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index 07a55e9d0fb..53a0bb6a50e 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml
index 0bebf11f10e..9aa901fe469 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -39,6 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/unit_test_mariadb102.yml b/.github/workflows/unit_test_mariadb102.yml
index 1c1b49118ef..4de67e1adea 100644
--- a/.github/workflows/unit_test_mariadb102.yml
+++ b/.github/workflows/unit_test_mariadb102.yml
@@ -63,6 +63,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
     - name: Run make tools
       run: |
diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
index fe4c246c5f6..c2ed1f52125 100644
--- a/.github/workflows/unit_test_mysql80.yml
+++ b/.github/workflows/unit_test_mysql80.yml
@@ -63,6 +63,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
     - name: Run make tools
       run: |
diff --git a/.github/workflows/unit_test_percona56.yml b/.github/workflows/unit_test_percona56.yml
index 5be13caed8c..9e7f69abe47 100644
--- a/.github/workflows/unit_test_percona56.yml
+++ b/.github/workflows/unit_test_percona56.yml
@@ -64,6 +64,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
     - name: Run make tools
       run: |
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index 8f6ccd054d7..679bffc8764 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -37,6 +37,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
         {{if .InstallXtraBackup}}
 
diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
index a42ab4f2f1a..2240dfb9faa 100644
--- a/test/templates/dockerfile.tpl
+++ b/test/templates/dockerfile.tpl
@@ -40,5 +40,8 @@ RUN mkdir -p $VTDATAROOT
 RUN make tools
 {{end}}
 
-  # sleep for 50 minutes
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+
+# sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index 2e91ac59191..9acf028970f 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -119,6 +119,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
+        go get -d golang.org/x/tools/cmd/goimports
 
     - name: Run make tools
       run: |

From 15b766ce3a97ebbe03cd32382c0ac5395d5718a4 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 10:58:29 +0200
Subject: [PATCH 05/11] Test install goimports in CI dockerfile

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/docker/cluster_test_vreplication_basic/Dockerfile  | 7 ++++---
 .../docker/cluster_test_vreplication_cellalias/Dockerfile  | 7 ++++---
 .../docker/cluster_test_vreplication_multicell/Dockerfile  | 7 ++++---
 .github/docker/cluster_test_vreplication_v2/Dockerfile     | 7 ++++---
 .github/docker/unit_test_mariadb103/Dockerfile             | 7 ++++---
 .github/docker/unit_test_mysql57/Dockerfile                | 7 ++++---
 test/templates/dockerfile.tpl                              | 7 ++++---
 7 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/docker/cluster_test_vreplication_basic/Dockerfile b/.github/docker/cluster_test_vreplication_basic/Dockerfile
index 362f21a5ebf..56ce593f7bb 100644
--- a/.github/docker/cluster_test_vreplication_basic/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_basic/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -35,8 +39,5 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
index 362f21a5ebf..56ce593f7bb 100644
--- a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -35,8 +39,5 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_multicell/Dockerfile b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
index 362f21a5ebf..56ce593f7bb 100644
--- a/.github/docker/cluster_test_vreplication_multicell/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -35,8 +39,5 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_v2/Dockerfile b/.github/docker/cluster_test_vreplication_v2/Dockerfile
index 362f21a5ebf..56ce593f7bb 100644
--- a/.github/docker/cluster_test_vreplication_v2/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_v2/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -35,8 +39,5 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/unit_test_mariadb103/Dockerfile b/.github/docker/unit_test_mariadb103/Dockerfile
index 944e3f96cd0..5f6afbe31cb 100644
--- a/.github/docker/unit_test_mariadb103/Dockerfile
+++ b/.github/docker/unit_test_mariadb103/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -30,8 +34,5 @@ RUN mkdir -p $VTDATAROOT
 # make tools
 RUN make tools
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/unit_test_mysql57/Dockerfile b/.github/docker/unit_test_mysql57/Dockerfile
index 0b8c2c5c0b5..d598a80cd96 100644
--- a/.github/docker/unit_test_mysql57/Dockerfile
+++ b/.github/docker/unit_test_mysql57/Dockerfile
@@ -7,6 +7,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -30,8 +34,5 @@ RUN mkdir -p $VTDATAROOT
 # make tools
 RUN make tools
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
index 2240dfb9faa..115f7cf064d 100644
--- a/test/templates/dockerfile.tpl
+++ b/test/templates/dockerfile.tpl
@@ -5,6 +5,10 @@ FROM "${image}"
 
 USER root
 
+# install goimports
+RUN go get -d golang.org/x/tools/cmd/goimports
+RUN where goimports
+
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -40,8 +44,5 @@ RUN mkdir -p $VTDATAROOT
 RUN make tools
 {{end}}
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file

From a5443e89ecbea72a582f4122c0908541a3403498 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 11:12:25 +0200
Subject: [PATCH 06/11] go install instead of go get for goimports in CI

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/docker/cluster_test_vreplication_basic/Dockerfile  | 7 +++----
 .../docker/cluster_test_vreplication_cellalias/Dockerfile  | 7 +++----
 .../docker/cluster_test_vreplication_multicell/Dockerfile  | 7 +++----
 .github/docker/cluster_test_vreplication_v2/Dockerfile     | 7 +++----
 .github/docker/unit_test_mariadb103/Dockerfile             | 7 +++----
 .github/docker/unit_test_mysql57/Dockerfile                | 7 +++----
 .github/workflows/cluster_endtoend_11.yml                  | 2 +-
 .github/workflows/cluster_endtoend_12.yml                  | 2 +-
 .github/workflows/cluster_endtoend_13.yml                  | 2 +-
 .github/workflows/cluster_endtoend_14.yml                  | 2 +-
 .github/workflows/cluster_endtoend_15.yml                  | 2 +-
 .github/workflows/cluster_endtoend_16.yml                  | 2 +-
 .github/workflows/cluster_endtoend_17.yml                  | 2 +-
 .github/workflows/cluster_endtoend_18.yml                  | 2 +-
 .github/workflows/cluster_endtoend_19.yml                  | 2 +-
 .github/workflows/cluster_endtoend_20.yml                  | 2 +-
 .github/workflows/cluster_endtoend_21.yml                  | 2 +-
 .github/workflows/cluster_endtoend_22.yml                  | 2 +-
 .github/workflows/cluster_endtoend_23.yml                  | 2 +-
 .github/workflows/cluster_endtoend_24.yml                  | 2 +-
 .github/workflows/cluster_endtoend_26.yml                  | 2 +-
 .github/workflows/cluster_endtoend_mysql80.yml             | 2 +-
 .../workflows/cluster_endtoend_onlineddl_declarative.yml   | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_ghost.yml     | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_revert.yml    | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_singleton.yml | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_vrepl.yml     | 2 +-
 .../workflows/cluster_endtoend_onlineddl_vrepl_stress.yml  | 2 +-
 .../cluster_endtoend_onlineddl_vrepl_stress_suite.yml      | 2 +-
 .../workflows/cluster_endtoend_onlineddl_vrepl_suite.yml   | 2 +-
 .github/workflows/cluster_endtoend_resharding.yml          | 2 +-
 .github/workflows/cluster_endtoend_resharding_bytes.yml    | 2 +-
 .../workflows/cluster_endtoend_tabletmanager_tablegc.yml   | 2 +-
 .../workflows/cluster_endtoend_tabletmanager_throttler.yml | 2 +-
 ...ster_endtoend_tabletmanager_throttler_custom_config.yml | 2 +-
 .../workflows/cluster_endtoend_vreplication_migrate.yml    | 2 +-
 .github/workflows/cluster_endtoend_vstream_failover.yml    | 2 +-
 .../cluster_endtoend_vstream_stoponreshard_false.yml       | 2 +-
 .../cluster_endtoend_vstream_stoponreshard_true.yml        | 2 +-
 .github/workflows/cluster_endtoend_vtgate_buffer.yml       | 2 +-
 .../workflows/cluster_endtoend_vtgate_concurrentdml.yml    | 2 +-
 .github/workflows/cluster_endtoend_vtgate_gen4.yml         | 2 +-
 .../workflows/cluster_endtoend_vtgate_readafterwrite.yml   | 2 +-
 .github/workflows/cluster_endtoend_vtgate_reservedconn.yml | 2 +-
 .github/workflows/cluster_endtoend_vtgate_schema.yml       | 2 +-
 .github/workflows/cluster_endtoend_vtgate_topo.yml         | 2 +-
 .github/workflows/cluster_endtoend_vtgate_transaction.yml  | 2 +-
 .github/workflows/cluster_endtoend_vtgate_unsharded.yml    | 2 +-
 .github/workflows/cluster_endtoend_vtgate_vindex.yml       | 2 +-
 .github/workflows/cluster_endtoend_vtgate_vschema.yml      | 2 +-
 .github/workflows/cluster_endtoend_vtorc.yml               | 2 +-
 .github/workflows/cluster_endtoend_xb_recovery.yml         | 2 +-
 .github/workflows/unit_test_mariadb102.yml                 | 2 +-
 .github/workflows/unit_test_mysql80.yml                    | 2 +-
 .github/workflows/unit_test_percona56.yml                  | 2 +-
 test/templates/cluster_endtoend_test.tpl                   | 2 +-
 test/templates/dockerfile.tpl                              | 7 +++----
 test/templates/unit_test.tpl                               | 2 +-
 58 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/.github/docker/cluster_test_vreplication_basic/Dockerfile b/.github/docker/cluster_test_vreplication_basic/Dockerfile
index 56ce593f7bb..f246f980168 100644
--- a/.github/docker/cluster_test_vreplication_basic/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_basic/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -39,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
index 56ce593f7bb..f246f980168 100644
--- a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -39,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_multicell/Dockerfile b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
index 56ce593f7bb..f246f980168 100644
--- a/.github/docker/cluster_test_vreplication_multicell/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_multicell/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -39,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/cluster_test_vreplication_v2/Dockerfile b/.github/docker/cluster_test_vreplication_v2/Dockerfile
index 56ce593f7bb..f246f980168 100644
--- a/.github/docker/cluster_test_vreplication_v2/Dockerfile
+++ b/.github/docker/cluster_test_vreplication_v2/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -39,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # sleep for 50 minutes
 CMD sleep 3000
\ No newline at end of file
diff --git a/.github/docker/unit_test_mariadb103/Dockerfile b/.github/docker/unit_test_mariadb103/Dockerfile
index 5f6afbe31cb..e35e4e14152 100644
--- a/.github/docker/unit_test_mariadb103/Dockerfile
+++ b/.github/docker/unit_test_mariadb103/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -31,6 +27,9 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # make tools
 RUN make tools
 
diff --git a/.github/docker/unit_test_mysql57/Dockerfile b/.github/docker/unit_test_mysql57/Dockerfile
index d598a80cd96..15f5d6b2027 100644
--- a/.github/docker/unit_test_mysql57/Dockerfile
+++ b/.github/docker/unit_test_mysql57/Dockerfile
@@ -7,10 +7,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -31,6 +27,9 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 # make tools
 RUN make tools
 
diff --git a/.github/workflows/cluster_endtoend_11.yml b/.github/workflows/cluster_endtoend_11.yml
index 091fc6d76ef..7716513158c 100644
--- a/.github/workflows/cluster_endtoend_11.yml
+++ b/.github/workflows/cluster_endtoend_11.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index d246e92bb24..d3089a8e5c6 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
index 79fdc6627b4..1026d29a080 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_14.yml b/.github/workflows/cluster_endtoend_14.yml
index 072573a7891..22752d7d86d 100644
--- a/.github/workflows/cluster_endtoend_14.yml
+++ b/.github/workflows/cluster_endtoend_14.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
index c73e3d54c96..d67fd0d522b 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_16.yml b/.github/workflows/cluster_endtoend_16.yml
index 6b00b6aae49..a3855b7eb05 100644
--- a/.github/workflows/cluster_endtoend_16.yml
+++ b/.github/workflows/cluster_endtoend_16.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_17.yml b/.github/workflows/cluster_endtoend_17.yml
index 50769c4c5be..c183821e90f 100644
--- a/.github/workflows/cluster_endtoend_17.yml
+++ b/.github/workflows/cluster_endtoend_17.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 9213ab4b2bb..0b77ef017a6 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_19.yml b/.github/workflows/cluster_endtoend_19.yml
index d91efc8ae61..2c83c31fcbb 100644
--- a/.github/workflows/cluster_endtoend_19.yml
+++ b/.github/workflows/cluster_endtoend_19.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_20.yml b/.github/workflows/cluster_endtoend_20.yml
index 4197a724937..ca11e57e765 100644
--- a/.github/workflows/cluster_endtoend_20.yml
+++ b/.github/workflows/cluster_endtoend_20.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
index ba1cc3bd628..9ab0a419404 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml
index 99b61dec27d..36754672693 100644
--- a/.github/workflows/cluster_endtoend_22.yml
+++ b/.github/workflows/cluster_endtoend_22.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_23.yml b/.github/workflows/cluster_endtoend_23.yml
index 290edc8a801..f4dc31a90da 100644
--- a/.github/workflows/cluster_endtoend_23.yml
+++ b/.github/workflows/cluster_endtoend_23.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_24.yml b/.github/workflows/cluster_endtoend_24.yml
index 63fadc882ba..7eee6776c55 100644
--- a/.github/workflows/cluster_endtoend_24.yml
+++ b/.github/workflows/cluster_endtoend_24.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml
index 0400d42b708..9d56b6be2b8 100644
--- a/.github/workflows/cluster_endtoend_26.yml
+++ b/.github/workflows/cluster_endtoend_26.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
index 9c64eadea6c..08ba736a2eb 100644
--- a/.github/workflows/cluster_endtoend_mysql80.yml
+++ b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
index 2f825d2d874..56cb146fb89 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
index 01cd1851993..70db7a6b554 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
index 8b54a70d21d..561b0b6aac9 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
index 966c20bde4b..760779e6e9e 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index e9aa5688df0..6278daf956b 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index 50cef4fd627..4c5409c291d 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index 2d1f20bcfe7..89df820c375 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index e920ea9a8e7..b30b3213f3b 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding.yml b/.github/workflows/cluster_endtoend_resharding.yml
index ed7b8166431..60e1acf2050 100644
--- a/.github/workflows/cluster_endtoend_resharding.yml
+++ b/.github/workflows/cluster_endtoend_resharding.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding_bytes.yml b/.github/workflows/cluster_endtoend_resharding_bytes.yml
index 0de26eccaf2..60ed84add7e 100644
--- a/.github/workflows/cluster_endtoend_resharding_bytes.yml
+++ b/.github/workflows/cluster_endtoend_resharding_bytes.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index 0033c602f5d..7211331f448 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
index 731f04a20e8..596f1c56d66 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
index 6b66d80f4bd..8187b6a88c6 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index 3f9f143c9bb..49a34124232 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_failover.yml b/.github/workflows/cluster_endtoend_vstream_failover.yml
index 57ca13811ae..57ad431f582 100644
--- a/.github/workflows/cluster_endtoend_vstream_failover.yml
+++ b/.github/workflows/cluster_endtoend_vstream_failover.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
index 4e99a3ed4e1..f867c95a58b 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
index c0bc32b3178..3de002a4ee5 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_buffer.yml b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
index 2ef4b182d4c..39f6b55ea5d 100644
--- a/.github/workflows/cluster_endtoend_vtgate_buffer.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
index 733b7d582ae..9fad2669286 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index 17f4c8f6681..ac59642e437 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index 17bef0aea00..56a3a0f2e22 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 41027b795bd..22a6c03be88 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index 7aada9496e5..4621b424c54 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index d72019f5db9..0f91a205ae0 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index bd8b2c1b211..feb7ab83204 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index dfc96f2e242..82e3ad29202 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex.yml b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
index 7f91ed4135d..5952e766699 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
index 8517c163a79..adb3329c614 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index 53a0bb6a50e..f2198b2efef 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml
index 9aa901fe469..be3b13e6b2a 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -39,7 +39,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/unit_test_mariadb102.yml b/.github/workflows/unit_test_mariadb102.yml
index 4de67e1adea..6735cb61e97 100644
--- a/.github/workflows/unit_test_mariadb102.yml
+++ b/.github/workflows/unit_test_mariadb102.yml
@@ -63,7 +63,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make tools
       run: |
diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
index c2ed1f52125..998fbc1bbd5 100644
--- a/.github/workflows/unit_test_mysql80.yml
+++ b/.github/workflows/unit_test_mysql80.yml
@@ -63,7 +63,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make tools
       run: |
diff --git a/.github/workflows/unit_test_percona56.yml b/.github/workflows/unit_test_percona56.yml
index 9e7f69abe47..3975dffbe4b 100644
--- a/.github/workflows/unit_test_percona56.yml
+++ b/.github/workflows/unit_test_percona56.yml
@@ -64,7 +64,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make tools
       run: |
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index 679bffc8764..eb64d1e1ba8 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -37,7 +37,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
         {{if .InstallXtraBackup}}
 
diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
index 115f7cf064d..85fad6ea1fd 100644
--- a/test/templates/dockerfile.tpl
+++ b/test/templates/dockerfile.tpl
@@ -5,10 +5,6 @@ FROM "${image}"
 
 USER root
 
-# install goimports
-RUN go get -d golang.org/x/tools/cmd/goimports
-RUN where goimports
-
 # Re-copy sources from working tree
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
@@ -39,6 +35,9 @@ ENV VTDATAROOT /vt/vtdataroot
 # create the vtdataroot directory
 RUN mkdir -p $VTDATAROOT
 
+# install goimports
+RUN go install golang.org/x/tools/cmd/goimports@latest
+
 {{if .MakeTools}}
 # make tools
 RUN make tools
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index 9acf028970f..c24de874c44 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -119,7 +119,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
-        go get -d golang.org/x/tools/cmd/goimports
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make tools
       run: |

From b8630c5831332d7a5443a143aad056b37b7cd739 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 12:01:17 +0200
Subject: [PATCH 07/11] Addition of a check imports CI workflow to run and
 compare goimports output

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/check_imports.yml | 25 +++++++++++++++++++++++++
 examples/local/vstream_client.go    |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 .github/workflows/check_imports.yml

diff --git a/.github/workflows/check_imports.yml b/.github/workflows/check_imports.yml
new file mode 100644
index 00000000000..38f8ae7934d
--- /dev/null
+++ b/.github/workflows/check_imports.yml
@@ -0,0 +1,25 @@
+name: check_imports
+on: [pull_request]
+jobs:
+
+  build:
+    name: Check Imports
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.17
+
+    - name: install goimports
+      run: |
+        go install golang.org/x/tools/cmd/goimports@latest
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Run goimports
+      run: |
+        out=$(goimports -local vitess.io/vitess -l -w $(find . -name "*.go" | grep -v ".pb.go"))
+        echo $out | grep go > /dev/null && echo -e "The following files are malformatted:\n$out" && exit 1 || echo "All the files are formatted correctly"
diff --git a/examples/local/vstream_client.go b/examples/local/vstream_client.go
index e9ccc7c08a6..be74f1976a3 100644
--- a/examples/local/vstream_client.go
+++ b/examples/local/vstream_client.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"log"
 	"time"
+
 	vtgatepb "vitess.io/vitess/go/vt/proto/vtgate"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"

From 528d66ff97a21aab2f508abad49bb70bdcd6b1f7 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 12:05:57 +0200
Subject: [PATCH 08/11] New way of installing goimports in CI

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/check_imports.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check_imports.yml b/.github/workflows/check_imports.yml
index 38f8ae7934d..001d78f8dc3 100644
--- a/.github/workflows/check_imports.yml
+++ b/.github/workflows/check_imports.yml
@@ -8,17 +8,17 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2.1.4
       with:
         go-version: 1.17
 
-    - name: install goimports
-      run: |
-        go install golang.org/x/tools/cmd/goimports@latest
-
     - name: Check out code
       uses: actions/checkout@v2
 
+    - name: Install goimports
+      run: |
+        go install golang.org/x/tools/cmd/goimports@latest
+
     - name: Run goimports
       run: |
         out=$(goimports -local vitess.io/vitess -l -w $(find . -name "*.go" | grep -v ".pb.go"))

From f428a273b59caff0753c6b351ea9d311711e4032 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 13:07:37 +0200
Subject: [PATCH 09/11] Upgrade actions/setup-go from v1 to v2 to enable go
 install within CI

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/check_formatting.yml                          | 2 +-
 .github/workflows/check_imports.yml                             | 2 +-
 .github/workflows/check_make_parser.yml                         | 2 +-
 .github/workflows/check_make_sizegen.yml                        | 2 +-
 .github/workflows/check_make_visitor.yml                        | 2 +-
 .github/workflows/cluster_endtoend_11.yml                       | 2 +-
 .github/workflows/cluster_endtoend_12.yml                       | 2 +-
 .github/workflows/cluster_endtoend_13.yml                       | 2 +-
 .github/workflows/cluster_endtoend_14.yml                       | 2 +-
 .github/workflows/cluster_endtoend_15.yml                       | 2 +-
 .github/workflows/cluster_endtoend_16.yml                       | 2 +-
 .github/workflows/cluster_endtoend_17.yml                       | 2 +-
 .github/workflows/cluster_endtoend_18.yml                       | 2 +-
 .github/workflows/cluster_endtoend_19.yml                       | 2 +-
 .github/workflows/cluster_endtoend_20.yml                       | 2 +-
 .github/workflows/cluster_endtoend_21.yml                       | 2 +-
 .github/workflows/cluster_endtoend_22.yml                       | 2 +-
 .github/workflows/cluster_endtoend_23.yml                       | 2 +-
 .github/workflows/cluster_endtoend_24.yml                       | 2 +-
 .github/workflows/cluster_endtoend_26.yml                       | 2 +-
 .github/workflows/cluster_endtoend_mysql80.yml                  | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_declarative.yml    | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_ghost.yml          | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_revert.yml         | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_singleton.yml      | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_vrepl.yml          | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml   | 2 +-
 .../workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml | 2 +-
 .github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml    | 2 +-
 .github/workflows/cluster_endtoend_resharding.yml               | 2 +-
 .github/workflows/cluster_endtoend_resharding_bytes.yml         | 2 +-
 .github/workflows/cluster_endtoend_tabletmanager_tablegc.yml    | 2 +-
 .github/workflows/cluster_endtoend_tabletmanager_throttler.yml  | 2 +-
 .../cluster_endtoend_tabletmanager_throttler_custom_config.yml  | 2 +-
 .github/workflows/cluster_endtoend_upgrade.yml                  | 2 +-
 .github/workflows/cluster_endtoend_vreplication_migrate.yml     | 2 +-
 .github/workflows/cluster_endtoend_vstream_failover.yml         | 2 +-
 .../workflows/cluster_endtoend_vstream_stoponreshard_false.yml  | 2 +-
 .../workflows/cluster_endtoend_vstream_stoponreshard_true.yml   | 2 +-
 .github/workflows/cluster_endtoend_vtgate_buffer.yml            | 2 +-
 .github/workflows/cluster_endtoend_vtgate_concurrentdml.yml     | 2 +-
 .github/workflows/cluster_endtoend_vtgate_gen4.yml              | 2 +-
 .github/workflows/cluster_endtoend_vtgate_readafterwrite.yml    | 2 +-
 .github/workflows/cluster_endtoend_vtgate_reservedconn.yml      | 2 +-
 .github/workflows/cluster_endtoend_vtgate_schema.yml            | 2 +-
 .github/workflows/cluster_endtoend_vtgate_topo.yml              | 2 +-
 .github/workflows/cluster_endtoend_vtgate_transaction.yml       | 2 +-
 .github/workflows/cluster_endtoend_vtgate_unsharded.yml         | 2 +-
 .github/workflows/cluster_endtoend_vtgate_vindex.yml            | 2 +-
 .github/workflows/cluster_endtoend_vtgate_vschema.yml           | 2 +-
 .github/workflows/cluster_endtoend_vtorc.yml                    | 2 +-
 .github/workflows/cluster_endtoend_xb_recovery.yml              | 2 +-
 .github/workflows/cluster_initial_sharding_multi.yml            | 2 +-
 .github/workflows/create_release.yml                            | 2 +-
 .github/workflows/docker_test_1.yml                             | 2 +-
 .github/workflows/docker_test_2.yml                             | 2 +-
 .github/workflows/docker_test_3.yml                             | 2 +-
 .github/workflows/e2e_race.yml                                  | 2 +-
 .github/workflows/endtoend.yml                                  | 2 +-
 .github/workflows/ensure_bootstrap_updated.yml                  | 2 +-
 .github/workflows/golangci-linter.yml                           | 2 +-
 .github/workflows/gomod-tidy.yml                                | 2 +-
 .github/workflows/legacy_local_example.yml                      | 2 +-
 .github/workflows/local_example.yml                             | 2 +-
 .github/workflows/region_example.yml                            | 2 +-
 .github/workflows/sonar_analysis.yml                            | 2 +-
 .github/workflows/unit_race.yml                                 | 2 +-
 .github/workflows/unit_test_mariadb102.yml                      | 2 +-
 .github/workflows/unit_test_mysql80.yml                         | 2 +-
 .github/workflows/unit_test_percona56.yml                       | 2 +-
 test/templates/cluster_endtoend_test.tpl                        | 2 +-
 test/templates/unit_test.tpl                                    | 2 +-
 72 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/check_formatting.yml b/.github/workflows/check_formatting.yml
index a191afa76fa..31d3f18560a 100644
--- a/.github/workflows/check_formatting.yml
+++ b/.github/workflows/check_formatting.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/check_imports.yml b/.github/workflows/check_imports.yml
index 001d78f8dc3..4beffd2c998 100644
--- a/.github/workflows/check_imports.yml
+++ b/.github/workflows/check_imports.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v2.1.4
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/check_make_parser.yml b/.github/workflows/check_make_parser.yml
index 6506878a407..9151669ac5c 100644
--- a/.github/workflows/check_make_parser.yml
+++ b/.github/workflows/check_make_parser.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/check_make_sizegen.yml b/.github/workflows/check_make_sizegen.yml
index 3e4d08fbc8b..42039024c37 100644
--- a/.github/workflows/check_make_sizegen.yml
+++ b/.github/workflows/check_make_sizegen.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
     
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/check_make_visitor.yml b/.github/workflows/check_make_visitor.yml
index 9cb0aac0551..fea9ac87e97 100644
--- a/.github/workflows/check_make_visitor.yml
+++ b/.github/workflows/check_make_visitor.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_11.yml b/.github/workflows/cluster_endtoend_11.yml
index 7716513158c..f582ab07a26 100644
--- a/.github/workflows/cluster_endtoend_11.yml
+++ b/.github/workflows/cluster_endtoend_11.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index d3089a8e5c6..11a39f0fefc 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
index 1026d29a080..ef6cbf4dd6c 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_14.yml b/.github/workflows/cluster_endtoend_14.yml
index 22752d7d86d..3493197e0ad 100644
--- a/.github/workflows/cluster_endtoend_14.yml
+++ b/.github/workflows/cluster_endtoend_14.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
index d67fd0d522b..fd533df05f0 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_16.yml b/.github/workflows/cluster_endtoend_16.yml
index a3855b7eb05..557061716cc 100644
--- a/.github/workflows/cluster_endtoend_16.yml
+++ b/.github/workflows/cluster_endtoend_16.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_17.yml b/.github/workflows/cluster_endtoend_17.yml
index c183821e90f..6b59d267b31 100644
--- a/.github/workflows/cluster_endtoend_17.yml
+++ b/.github/workflows/cluster_endtoend_17.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 0b77ef017a6..05609ef4205 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_19.yml b/.github/workflows/cluster_endtoend_19.yml
index 2c83c31fcbb..182ff1e9815 100644
--- a/.github/workflows/cluster_endtoend_19.yml
+++ b/.github/workflows/cluster_endtoend_19.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_20.yml b/.github/workflows/cluster_endtoend_20.yml
index ca11e57e765..3e1b4c6bcb7 100644
--- a/.github/workflows/cluster_endtoend_20.yml
+++ b/.github/workflows/cluster_endtoend_20.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
index 9ab0a419404..aa44b10063c 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml
index 36754672693..a1225fb5769 100644
--- a/.github/workflows/cluster_endtoend_22.yml
+++ b/.github/workflows/cluster_endtoend_22.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_23.yml b/.github/workflows/cluster_endtoend_23.yml
index f4dc31a90da..3f6d8231553 100644
--- a/.github/workflows/cluster_endtoend_23.yml
+++ b/.github/workflows/cluster_endtoend_23.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_24.yml b/.github/workflows/cluster_endtoend_24.yml
index 7eee6776c55..6c0f83643fc 100644
--- a/.github/workflows/cluster_endtoend_24.yml
+++ b/.github/workflows/cluster_endtoend_24.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml
index 9d56b6be2b8..8ef1c943437 100644
--- a/.github/workflows/cluster_endtoend_26.yml
+++ b/.github/workflows/cluster_endtoend_26.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
index 08ba736a2eb..b93515124fb 100644
--- a/.github/workflows/cluster_endtoend_mysql80.yml
+++ b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
index 56cb146fb89..deff558feb2 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
index 70db7a6b554..65b058c846f 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
index 561b0b6aac9..180571060e0 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
index 760779e6e9e..ebc8c613842 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index 6278daf956b..7a8f7faca1e 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index 4c5409c291d..8fdc6d274c9 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index 89df820c375..ab5b393373c 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index b30b3213f3b..97e57988548 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_resharding.yml b/.github/workflows/cluster_endtoend_resharding.yml
index 60e1acf2050..ee75c878310 100644
--- a/.github/workflows/cluster_endtoend_resharding.yml
+++ b/.github/workflows/cluster_endtoend_resharding.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_resharding_bytes.yml b/.github/workflows/cluster_endtoend_resharding_bytes.yml
index 60ed84add7e..aa5168bf6da 100644
--- a/.github/workflows/cluster_endtoend_resharding_bytes.yml
+++ b/.github/workflows/cluster_endtoend_resharding_bytes.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index 7211331f448..26b6c093b2f 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
index 596f1c56d66..9aa9d4a4efd 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
index 8187b6a88c6..5a48c4b664e 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_upgrade.yml b/.github/workflows/cluster_endtoend_upgrade.yml
index 087f7436062..9ea8929d422 100644
--- a/.github/workflows/cluster_endtoend_upgrade.yml
+++ b/.github/workflows/cluster_endtoend_upgrade.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index 49a34124232..08266c0a126 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vstream_failover.yml b/.github/workflows/cluster_endtoend_vstream_failover.yml
index 57ad431f582..34e7693827d 100644
--- a/.github/workflows/cluster_endtoend_vstream_failover.yml
+++ b/.github/workflows/cluster_endtoend_vstream_failover.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
index f867c95a58b..958d1383ce3 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
index 3de002a4ee5..198db4247c6 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_buffer.yml b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
index 39f6b55ea5d..3d778b6d402 100644
--- a/.github/workflows/cluster_endtoend_vtgate_buffer.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
index 9fad2669286..f435889e497 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index ac59642e437..d839a01e4a4 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index 56a3a0f2e22..6de8475461d 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 22a6c03be88..1ec6e11a2e2 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index 4621b424c54..7576e7ce966 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index 0f91a205ae0..5d771f346f7 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index feb7ab83204..c9b3c9924ab 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index 82e3ad29202..5e460fc9aa8 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex.yml b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
index 5952e766699..cdecc82be00 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
index adb3329c614..cd537af02c9 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index f2198b2efef..b72e86151fc 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml
index be3b13e6b2a..a41cbb98c5f 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/cluster_initial_sharding_multi.yml b/.github/workflows/cluster_initial_sharding_multi.yml
index 54dc50c509a..ba2bcd6635b 100644
--- a/.github/workflows/cluster_initial_sharding_multi.yml
+++ b/.github/workflows/cluster_initial_sharding_multi.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 79f9bee0b6f..806a11f42cb 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/docker_test_1.yml b/.github/workflows/docker_test_1.yml
index fe4ffde2e8d..429cc834d50 100644
--- a/.github/workflows/docker_test_1.yml
+++ b/.github/workflows/docker_test_1.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/docker_test_2.yml b/.github/workflows/docker_test_2.yml
index 57fa228257c..b60edc05469 100644
--- a/.github/workflows/docker_test_2.yml
+++ b/.github/workflows/docker_test_2.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/docker_test_3.yml b/.github/workflows/docker_test_3.yml
index 8026a25d5e1..f0eee6dc2bf 100644
--- a/.github/workflows/docker_test_3.yml
+++ b/.github/workflows/docker_test_3.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml
index d0f9e7a06b0..04141b93a55 100644
--- a/.github/workflows/e2e_race.yml
+++ b/.github/workflows/e2e_race.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
index 5182fbb9d99..90c056ea764 100644
--- a/.github/workflows/endtoend.yml
+++ b/.github/workflows/endtoend.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/ensure_bootstrap_updated.yml b/.github/workflows/ensure_bootstrap_updated.yml
index 2b5a0c5bd57..cf192e9eba7 100644
--- a/.github/workflows/ensure_bootstrap_updated.yml
+++ b/.github/workflows/ensure_bootstrap_updated.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.13
 
diff --git a/.github/workflows/golangci-linter.yml b/.github/workflows/golangci-linter.yml
index 084ee49235e..249d65b28a2 100644
--- a/.github/workflows/golangci-linter.yml
+++ b/.github/workflows/golangci-linter.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
       id: go
diff --git a/.github/workflows/gomod-tidy.yml b/.github/workflows/gomod-tidy.yml
index 82872cac837..069bab38cee 100644
--- a/.github/workflows/gomod-tidy.yml
+++ b/.github/workflows/gomod-tidy.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
       id: go
diff --git a/.github/workflows/legacy_local_example.yml b/.github/workflows/legacy_local_example.yml
index 0716ad4bdb2..11bf3126894 100644
--- a/.github/workflows/legacy_local_example.yml
+++ b/.github/workflows/legacy_local_example.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
index ddcaf76fdc1..0f8e8b1e48e 100644
--- a/.github/workflows/local_example.yml
+++ b/.github/workflows/local_example.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml
index 55956e453eb..baebb1e91fd 100644
--- a/.github/workflows/region_example.yml
+++ b/.github/workflows/region_example.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/sonar_analysis.yml b/.github/workflows/sonar_analysis.yml
index ff470b8a1c1..871e6cc7f83 100644
--- a/.github/workflows/sonar_analysis.yml
+++ b/.github/workflows/sonar_analysis.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.13
 
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
index 06b22b282ba..b840d4a0db6 100644
--- a/.github/workflows/unit_race.yml
+++ b/.github/workflows/unit_race.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/unit_test_mariadb102.yml b/.github/workflows/unit_test_mariadb102.yml
index 6735cb61e97..616634f1fee 100644
--- a/.github/workflows/unit_test_mariadb102.yml
+++ b/.github/workflows/unit_test_mariadb102.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
index 998fbc1bbd5..4e4118cd33a 100644
--- a/.github/workflows/unit_test_mysql80.yml
+++ b/.github/workflows/unit_test_mysql80.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/.github/workflows/unit_test_percona56.yml b/.github/workflows/unit_test_percona56.yml
index 3975dffbe4b..17bc8380c29 100644
--- a/.github/workflows/unit_test_percona56.yml
+++ b/.github/workflows/unit_test_percona56.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index eb64d1e1ba8..5a54b75891d 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 
diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl
index c24de874c44..19d905aef9c 100644
--- a/test/templates/unit_test.tpl
+++ b/test/templates/unit_test.tpl
@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: 1.17
 

From 4dc32005c6c89133fcd00528be621b09f90f73c6 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 14:04:52 +0200
Subject: [PATCH 10/11] Upgraded sizegen to run goimports in every situation
 and removed unrequired package from E2E ci tests

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/check_make_sizegen.yml      |  1 +
 .github/workflows/cluster_endtoend_11.yml     |  1 -
 .github/workflows/cluster_endtoend_12.yml     |  1 -
 .github/workflows/cluster_endtoend_13.yml     |  1 -
 .github/workflows/cluster_endtoend_14.yml     |  1 -
 .github/workflows/cluster_endtoend_15.yml     |  1 -
 .github/workflows/cluster_endtoend_16.yml     |  1 -
 .github/workflows/cluster_endtoend_17.yml     |  1 -
 .github/workflows/cluster_endtoend_18.yml     |  1 -
 .github/workflows/cluster_endtoend_19.yml     |  1 -
 .github/workflows/cluster_endtoend_20.yml     |  1 -
 .github/workflows/cluster_endtoend_21.yml     |  1 -
 .github/workflows/cluster_endtoend_22.yml     |  1 -
 .github/workflows/cluster_endtoend_23.yml     |  1 -
 .github/workflows/cluster_endtoend_24.yml     |  1 -
 .github/workflows/cluster_endtoend_26.yml     |  1 -
 .../workflows/cluster_endtoend_mysql80.yml    |  1 -
 ...cluster_endtoend_onlineddl_declarative.yml |  1 -
 .../cluster_endtoend_onlineddl_ghost.yml      |  1 -
 .../cluster_endtoend_onlineddl_revert.yml     |  1 -
 .../cluster_endtoend_onlineddl_singleton.yml  |  1 -
 .../cluster_endtoend_onlineddl_vrepl.yml      |  1 -
 ...luster_endtoend_onlineddl_vrepl_stress.yml |  1 -
 ..._endtoend_onlineddl_vrepl_stress_suite.yml |  1 -
 ...cluster_endtoend_onlineddl_vrepl_suite.yml |  1 -
 .../workflows/cluster_endtoend_resharding.yml |  1 -
 .../cluster_endtoend_resharding_bytes.yml     |  1 -
 ...cluster_endtoend_tabletmanager_tablegc.yml |  1 -
 ...uster_endtoend_tabletmanager_throttler.yml |  1 -
 ..._tabletmanager_throttler_custom_config.yml |  1 -
 .../cluster_endtoend_vreplication_migrate.yml |  1 -
 .../cluster_endtoend_vstream_failover.yml     |  1 -
 ...r_endtoend_vstream_stoponreshard_false.yml |  1 -
 ...er_endtoend_vstream_stoponreshard_true.yml |  1 -
 .../cluster_endtoend_vtgate_buffer.yml        |  1 -
 .../cluster_endtoend_vtgate_concurrentdml.yml |  1 -
 .../cluster_endtoend_vtgate_gen4.yml          |  1 -
 ...cluster_endtoend_vtgate_readafterwrite.yml |  1 -
 .../cluster_endtoend_vtgate_reservedconn.yml  |  1 -
 .../cluster_endtoend_vtgate_schema.yml        |  1 -
 .../cluster_endtoend_vtgate_topo.yml          |  1 -
 .../cluster_endtoend_vtgate_transaction.yml   |  1 -
 .../cluster_endtoend_vtgate_unsharded.yml     |  1 -
 .../cluster_endtoend_vtgate_vindex.yml        |  1 -
 .../cluster_endtoend_vtgate_vschema.yml       |  1 -
 .github/workflows/cluster_endtoend_vtorc.yml  |  1 -
 .../cluster_endtoend_xb_recovery.yml          |  1 -
 .github/workflows/unit_race.yml               |  1 +
 go/tools/sizegen/sizegen.go                   | 62 +++++++++----------
 test/templates/cluster_endtoend_test.tpl      |  1 -
 50 files changed, 32 insertions(+), 79 deletions(-)

diff --git a/.github/workflows/check_make_sizegen.yml b/.github/workflows/check_make_sizegen.yml
index 42039024c37..19ec9bd5638 100644
--- a/.github/workflows/check_make_sizegen.yml
+++ b/.github/workflows/check_make_sizegen.yml
@@ -34,6 +34,7 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make minimaltools
       run: |
diff --git a/.github/workflows/cluster_endtoend_11.yml b/.github/workflows/cluster_endtoend_11.yml
index f582ab07a26..21f3c3cf48e 100644
--- a/.github/workflows/cluster_endtoend_11.yml
+++ b/.github/workflows/cluster_endtoend_11.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index 11a39f0fefc..1d5838b3207 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
index ef6cbf4dd6c..2fb8443620d 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_14.yml b/.github/workflows/cluster_endtoend_14.yml
index 3493197e0ad..a6db467729b 100644
--- a/.github/workflows/cluster_endtoend_14.yml
+++ b/.github/workflows/cluster_endtoend_14.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
index fd533df05f0..bc05a63b58c 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_16.yml b/.github/workflows/cluster_endtoend_16.yml
index 557061716cc..2bf1abd8eab 100644
--- a/.github/workflows/cluster_endtoend_16.yml
+++ b/.github/workflows/cluster_endtoend_16.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_17.yml b/.github/workflows/cluster_endtoend_17.yml
index 6b59d267b31..d72d1f3324a 100644
--- a/.github/workflows/cluster_endtoend_17.yml
+++ b/.github/workflows/cluster_endtoend_17.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 05609ef4205..8c3b4916d78 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_19.yml b/.github/workflows/cluster_endtoend_19.yml
index 182ff1e9815..e317e23484f 100644
--- a/.github/workflows/cluster_endtoend_19.yml
+++ b/.github/workflows/cluster_endtoend_19.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_20.yml b/.github/workflows/cluster_endtoend_20.yml
index 3e1b4c6bcb7..6ec1e4d29cd 100644
--- a/.github/workflows/cluster_endtoend_20.yml
+++ b/.github/workflows/cluster_endtoend_20.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
index aa44b10063c..5f903e2ab9d 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml
index a1225fb5769..64a987ec5e0 100644
--- a/.github/workflows/cluster_endtoend_22.yml
+++ b/.github/workflows/cluster_endtoend_22.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_23.yml b/.github/workflows/cluster_endtoend_23.yml
index 3f6d8231553..514d4f9c1db 100644
--- a/.github/workflows/cluster_endtoend_23.yml
+++ b/.github/workflows/cluster_endtoend_23.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_24.yml b/.github/workflows/cluster_endtoend_24.yml
index 6c0f83643fc..15beb6ae4ed 100644
--- a/.github/workflows/cluster_endtoend_24.yml
+++ b/.github/workflows/cluster_endtoend_24.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml
index 8ef1c943437..dcbbe655ee5 100644
--- a/.github/workflows/cluster_endtoend_26.yml
+++ b/.github/workflows/cluster_endtoend_26.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
index b93515124fb..b6a4e6baeb6 100644
--- a/.github/workflows/cluster_endtoend_mysql80.yml
+++ b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
index deff558feb2..63c4090a776 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
index 65b058c846f..d02299b03d2 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
index 180571060e0..d678c1effc8 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
index ebc8c613842..a5ea7a1a415 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index 7a8f7faca1e..9b9d55956f4 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index 8fdc6d274c9..c9e801493d4 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index ab5b393373c..e3c8f6895c7 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index 97e57988548..7b3d43bab2e 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding.yml b/.github/workflows/cluster_endtoend_resharding.yml
index ee75c878310..0149df68077 100644
--- a/.github/workflows/cluster_endtoend_resharding.yml
+++ b/.github/workflows/cluster_endtoend_resharding.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_resharding_bytes.yml b/.github/workflows/cluster_endtoend_resharding_bytes.yml
index aa5168bf6da..d671e60b552 100644
--- a/.github/workflows/cluster_endtoend_resharding_bytes.yml
+++ b/.github/workflows/cluster_endtoend_resharding_bytes.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index 26b6c093b2f..b005da30ea6 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
index 9aa9d4a4efd..c083232c9b6 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
index 5a48c4b664e..5bc723b463f 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index 08266c0a126..a656823db23 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_failover.yml b/.github/workflows/cluster_endtoend_vstream_failover.yml
index 34e7693827d..56115d51214 100644
--- a/.github/workflows/cluster_endtoend_vstream_failover.yml
+++ b/.github/workflows/cluster_endtoend_vstream_failover.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
index 958d1383ce3..9a193bb2a96 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
index 198db4247c6..3dbad9823a5 100644
--- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
+++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_buffer.yml b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
index 3d778b6d402..29e3f845e1c 100644
--- a/.github/workflows/cluster_endtoend_vtgate_buffer.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_buffer.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
index f435889e497..90712891475 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index d839a01e4a4..57c85ab93b3 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index 6de8475461d..8c41648c6f1 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 1ec6e11a2e2..046fd3119d2 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index 7576e7ce966..8d090bb1a80 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index 5d771f346f7..a978ab484f2 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index c9b3c9924ab..65514420ca2 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index 5e460fc9aa8..50ff40891df 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex.yml b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
index cdecc82be00..7d6fa43c37c 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
index cd537af02c9..e04c25ea124 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index b72e86151fc..567a0978621 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml
index a41cbb98c5f..17b6d15a4f5 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -39,7 +39,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
         sudo apt-get install -y gnupg2
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
index b840d4a0db6..c828735e846 100644
--- a/.github/workflows/unit_race.yml
+++ b/.github/workflows/unit_race.yml
@@ -38,6 +38,7 @@ jobs:
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
 
         go mod download
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make tools
       run: |
diff --git a/go/tools/sizegen/sizegen.go b/go/tools/sizegen/sizegen.go
index 9372020ea67..b1c4762f902 100644
--- a/go/tools/sizegen/sizegen.go
+++ b/go/tools/sizegen/sizegen.go
@@ -475,10 +475,14 @@ func main() {
 		log.Printf("%d files OK", len(result))
 	} else {
 		for fullPath, file := range result {
-			if err := file.Save(fullPath); err != nil {
-				log.Fatalf("filed to save file to '%s': %v", fullPath, err)
+			content, err := getFileInGoimportFormat(file)
+			if err != nil {
+				log.Fatalf("failed to apply goimport to '%s': %v", fullPath, err)
+			}
+			err = ioutil.WriteFile(fullPath, content, 0664)
+			if err != nil {
+				log.Fatalf("failed to save file to '%s': %v", fullPath, err)
 			}
-			log.Printf("saved '%s'", fullPath)
 		}
 	}
 }
@@ -495,39 +499,13 @@ func VerifyFilesOnDisk(result map[string]*jen.File) (errors []error) {
 			continue
 		}
 
-		tempFile, err := ioutil.TempFile("/tmp", "*.go")
-		if err != nil {
-			errors = append(errors, fmt.Errorf("could not create a file: %w", err))
-			continue
-		}
-
-		var buf bytes.Buffer
-		if err := file.Render(&buf); err != nil {
-			errors = append(errors, fmt.Errorf("render error for '%s': %w", fullPath, err))
-			continue
-		}
-
-		_, err = tempFile.Write(buf.Bytes())
+		genFile, err := getFileInGoimportFormat(file)
 		if err != nil {
-			errors = append(errors, fmt.Errorf("could not render with file: %w", err))
+			errors = append(errors, fmt.Errorf("goimport error: %w", err))
 			continue
 		}
 
-		cmd := exec.Command("goimports", "-local", "vitess.io/vitess", "-w", tempFile.Name())
-		cmd.Stderr = os.Stderr
-		err = cmd.Run()
-		if err != nil {
-			errors = append(errors, fmt.Errorf("goimport execution error: %w", err))
-			continue
-		}
-
-		newFileContent, err := ioutil.ReadFile(tempFile.Name())
-		if err != nil {
-			errors = append(errors, fmt.Errorf("missing file on disk: %s (%w)", tempFile.Name(), err))
-			continue
-		}
-
-		if !bytes.Equal(existing, newFileContent) {
+		if !bytes.Equal(existing, genFile) {
 			errors = append(errors, fmt.Errorf("'%s' has changed", fullPath))
 			continue
 		}
@@ -587,3 +565,23 @@ func GenerateSizeHelpers(packagePatterns []string, typePatterns []string) (map[s
 
 	return sizegen.finalize(), nil
 }
+
+func getFileInGoimportFormat(file *jen.File) ([]byte, error) {
+	tempFile, err := ioutil.TempFile("/tmp", "*.go")
+	if err != nil {
+		return nil, err
+	}
+
+	err = file.Save(tempFile.Name())
+	if err != nil {
+		return nil, err
+	}
+
+	cmd := exec.Command("goimports", "-local", "vitess.io/vitess", "-w", tempFile.Name())
+	cmd.Stderr = os.Stderr
+	err = cmd.Run()
+	if err != nil {
+		return nil, err
+	}
+	return ioutil.ReadFile(tempFile.Name())
+}
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index 5a54b75891d..28a6c660dee 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -37,7 +37,6 @@ jobs:
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
-        go install golang.org/x/tools/cmd/goimports@latest
 
         {{if .InstallXtraBackup}}
 

From 247a4f01f503aab1a415248cdbc74c700de28818 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Thu, 16 Sep 2021 16:56:15 +0200
Subject: [PATCH 11/11] Trigger format and goimports check on every push

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 .github/workflows/check_formatting.yml | 2 +-
 .github/workflows/check_imports.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check_formatting.yml b/.github/workflows/check_formatting.yml
index 31d3f18560a..c4bc9841673 100644
--- a/.github/workflows/check_formatting.yml
+++ b/.github/workflows/check_formatting.yml
@@ -1,5 +1,5 @@
 name: check_formatting
-on: [pull_request]
+on: [pull_request,push]
 jobs:
 
   build:
diff --git a/.github/workflows/check_imports.yml b/.github/workflows/check_imports.yml
index 4beffd2c998..85aad83c80e 100644
--- a/.github/workflows/check_imports.yml
+++ b/.github/workflows/check_imports.yml
@@ -1,5 +1,5 @@
 name: check_imports
-on: [pull_request]
+on: [pull_request,push]
 jobs:
 
   build: