Merge pull request #8828 from planetscale/fix-make-sizegen

Apply goimports before checking make sizegen

.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 install golang.org/x/tools/cmd/goimports@latest
+
+# sleep for 50 minutes
 CMD sleep 3000

.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 install golang.org/x/tools/cmd/goimports@latest
+
+# sleep for 50 minutes
 CMD sleep 3000

.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 install golang.org/x/tools/cmd/goimports@latest
+
+# sleep for 50 minutes
 CMD sleep 3000

.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 install golang.org/x/tools/cmd/goimports@latest
+
+# sleep for 50 minutes
 CMD sleep 3000

.github/docker/unit_test_mariadb103/Dockerfile

@@ -27,8 +27,11 @@ 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
 
-  # sleep for 50 minutes
+# sleep for 50 minutes
 CMD sleep 3000

.github/docker/unit_test_mysql57/Dockerfile

@@ -27,8 +27,11 @@ 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
 
-  # sleep for 50 minutes
+# sleep for 50 minutes
 CMD sleep 3000

.github/workflows/check_formatting.yml

@@ -1,5 +1,5 @@
 name: check_formatting
-on: [pull_request]
+on: [pull_request,push]
 jobs:
 
   build:
@@ -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
 

.github/workflows/check_imports.yml

@@ -0,0 +1,25 @@
+name: check_imports
+on: [pull_request,push]
+jobs:
+
+  build:
+    name: Check Imports
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17
+
+    - 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"))
+        echo $out | grep go > /dev/null && echo -e "The following files are malformatted:\n$out" && exit 1 || echo "All the files are formatted correctly"

.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
 

.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
 
@@ -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: |

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

.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