[chore] Run make gogci (#45013)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Codewise, this PR is simply the result of running `make gogci` locally.
I've also added it as a check on PRs in `build-and-test` to ensure it's
been run by users, and added it to every `make generate` call to
hopefully make it so developers don't need to manually run it.

Author: crobert-1

.github/workflows/build-and-test.yml

@@ -188,6 +188,10 @@ jobs:
         run: |
           make gotidy
           git diff --exit-code || (echo 'go.mod/go.sum deps changes detected, please run "make gotidy" and commit the changes in this PR.' && exit 1)
+      - name: Check for go package import order
+        run: |
+          make gogci
+          git diff --exit-code || (echo 'go package imports not formatted, please run "make gogci" and commit the changes in this PR.' && exit 1)
       - name: Gen distributions
         run: |
           make gendistributions

Makefile.Common

@@ -273,9 +273,11 @@ generate: generate-tools
 ifeq ($(CURDIR),$(SRC_ROOT))
 	PATH="$(TOOLS_BIN_DIR_PORTABLE):$$PATH" $(MAKE) for-all CMD="$(GOCMD) generate ./..."
 	$(MAKE) gofmt
+	$(MAKE) gogci
 else
 	PATH="$(TOOLS_BIN_DIR_PORTABLE):$$PATH" $(GOCMD) generate ./...
 	$(MAKE) fmt
+	$(MAKE) gci
 endif
 
 .PHONY: lint