Rebase yolo-rebase-22.03 onto v22.0.3

.github/CODEOWNERS

@@ -1,92 +1 @@
-bootstrap.sh @frouioui
-go.mod @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-go.sum @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
-/.github/ @mattlord @rohit-nayak-ps @frouioui
-/.github/ISSUE_TEMPLATE/ @frouioui @mattlord
-/.github/workflows/ @frouioui @mattlord @rohit-nayak-ps
-/config/mycnf/ @shlomi-noach @mattlord
-/doc/ @frouioui
-/docker/ @derekperkins @mattlord @frouioui
-/examples/compose @shlomi-noach @frouioui
-/examples/demo @mattlord @rohit-nayak-ps
-/examples/local @rohit-nayak-ps @frouioui @mattlord
-/examples/operator @frouioui @mattlord
-/examples/region_sharding @mattlord
-/java/ @harshit-gangal
-/go/cmd @mattlord
-/go/cmd/vtadmin @beingnoble03
-/go/cmd/vtctldclient @mattlord
-/go/cmd/vtctldclient/command/throttler.go @shlomi-noach @mattlord
-/go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps @shlomi-noach @beingnoble03
-/go/cmd/vtctldclient/command/backups.go @frouioui @mattlord
-/go/cmd/vtbackup @frouioui
-/go/internal/flag @rohit-nayak-ps
-/go/mysql @harshit-gangal @systay @mattlord
-/go/pools @harshit-gangal
-/go/protoutil @mattlord
-/go/sqltypes @harshit-gangal @shlomi-noach
-/go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
-/go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
-/go/test/endtoend/schemadiff @shlomi-noach @mattlord
-/go/test/endtoend/transaction @harshit-gangal @systay @frouioui
-/go/test/endtoend/*throttler* @shlomi-noach @mattlord @timvaillancourt
-/go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
-/go/test/endtoend/vtorc @shlomi-noach @timvaillancourt
-/go/tools/ @frouioui @systay
-/go/vt/dbconnpool @harshit-gangal @mattlord
-/go/vt/discovery @frouioui
-/go/vt/discovery/*tablet_picker* @rohit-nayak-ps @mattlord
-/go/vt/mysqlctl @mattlord @frouioui
-/go/vt/proto @harshit-gangal @mattlord
-/go/vt/proto/vtadmin @beingnoble03
-/go/vt/schema @mattlord @shlomi-noach
-/go/vt/servenv @dbussink
-/go/vt/schemadiff @shlomi-noach @mattlord
-/go/vt/sqlparser @harshit-gangal @systay
-/go/vt/srvtopo @mattlord
-/go/vt/sysvars @harshit-gangal @systay
-/go/vt/topo @mattlord
-/go/vt/topotools @mattlord
-/go/vt/vitessdriver @harshit-gangal
-/go/vt/vtadmin @beingnoble03 @rohit-nayak-ps
-/go/vt/vtctl @rohit-nayak-ps
-/go/vt/vtctl/vtctl.go @rohit-nayak-ps
-/go/vt/vtctl/grpcvtctldclient @mattlord
-/go/vt/vtctl/grpcvtctldserver @mattlord
-/go/vt/vtctl/reparentutil
-/go/vt/vtctl/vtctldclient @mattlord
-/go/vt/vtctld @rohit-nayak-ps @mattlord
-/go/vt/vterrors @harshit-gangal @systay @frouioui
-/go/vt/vtexplain @systay @harshit-gangal
-/go/vt/vtgate @harshit-gangal @systay @frouioui
-/go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @arthurschreiber
-/go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vtgate/evalengine @dbussink @systay
-/go/vt/vtorc @shlomi-noach @timvaillancourt
-/go/vt/vttablet/*conn* @harshit-gangal @systay
-/go/vt/vttablet/endtoend @harshit-gangal @mattlord @rohit-nayak-ps @systay
-/go/vt/vttablet/grpc* @rohit-nayak-ps @shlomi-noach @harshit-gangal
-/go/vt/vttablet/onlineddl @mattlord @rohit-nayak-ps @shlomi-noach
-/go/vt/vttablet/queryservice @harshit-gangal @systay
-/go/vt/vttablet/tabletmanager @rohit-nayak-ps @shlomi-noach
-/go/vt/vttablet/tabletmanager/rpc_backup.go @rohit-nayak-ps @shlomi-noach @frouioui
-/go/vt/vttablet/tabletmanager/rpc_throttler.go @shlomi-noach @mattlord @timvaillancourt
-/go/vt/vttablet/tabletserver/throttle @shlomi-noach @mattlord @timvaillancourt
-/go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletmanager/vdiff @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
-/go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/vttablet/*tmclient* @rohit-nayak-ps @shlomi-noach
-/go/vt/vttablet/vexec @mattlord @rohit-nayak-ps @shlomi-noach
-/go/vt/wrangler @mattlord @rohit-nayak-ps
-/go/vt/vtctl/workflow @mattlord @rohit-nayak-ps @shlomi-noach @beingnoble03
-/proto/ @harshit-gangal
-/proto/vtadmin.proto @beingnoble03 @mattlord
-/proto/vtctldata.proto @mattlord
-/proto/vtctlservice.proto @mattlord
-/test/ @frouioui @rohit-nayak-ps @mattlord @harshit-gangal
-/tools/ @frouioui @rohit-nayak-ps
-/web/vtadmin @beingnoble03
-/web/vtadmin/src/proto @harshit-gangal @mattlord @beingnoble03
+* @slackhq/vitess-approvers

.github/workflows/check_make_vtadmin_authz_testgen.yml

@@ -22,6 +22,7 @@ jobs:
           exit 1
         fi
 
+
     - name: Check out code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
@@ -43,15 +44,18 @@ jobs:
             - 'go/vt/vtadmin/**'
             - '.github/workflows/check_make_vtadmin_authz_testgen.yml'
 
+    - name: Setup GitHub access token
+      if: steps.changes.outputs.vtadmin_changes == 'true'
+      run: git config --global url.https://${{ secrets.GH_ACCESS_TOKEN }}@github.com/.insteadOf https://github.com/
+
     - name: Tune the OS
       if: steps.changes.outputs.vtadmin_changes == 'true'
       uses: ./.github/actions/tune-os
 
     - name: Set up Go
       uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       if: steps.changes.outputs.vtadmin_changes == 'true'
-      with:
-        go-version-file: go.mod
+      uses: ./.github/actions/tune-os
 
     - name: Get dependencies
       if: steps.changes.outputs.vtadmin_changes == 'true'

.github/workflows/check_make_vtadmin_web_proto.yml

@@ -22,6 +22,7 @@ jobs:
           exit 1
         fi
 
+
     - name: Check out code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
@@ -49,7 +50,7 @@ jobs:
             - '.github/workflows/check_make_vtadmin_web_proto.yml'
 
     - name: Set up Go
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       if: steps.changes.outputs.proto_changes == 'true'
       with:
         go-version-file: go.mod

.github/workflows/cluster_endtoend_12.yml

@@ -19,6 +19,7 @@ env:
   LAUNCHABLE_ORGANIZATION: "vitess"
   LAUNCHABLE_WORKSPACE: "vitess-app"
   GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}"
+  GOPRIVATE: "github.com/slackhq/vitess-addons"
 
 jobs:
   build:
@@ -63,10 +64,14 @@ jobs:
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version-file: go.mod
 
+    - name: Setup GitHub access token
+      if: steps.changes.outputs.end_to_end == 'true'
+      run: git config --global url.https://${{ secrets.GH_ACCESS_TOKEN }}@github.com/.insteadOf https://github.com/
+
     - name: Set up python
       if: steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
@@ -95,6 +100,9 @@ jobs:
 
         go mod download
 
+        # install JUnit report formatter
+        go install github.com/vitessio/go-junit-report@HEAD
+
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -120,17 +128,24 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        go run test.go -docker=false -follow -shard 12
+        # run the tests however you normally do, then produce a JUnit XML file
+        go run test.go -docker=false -follow -shard 12 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
 
     - name: Record test results in launchable if PR is not a draft
-      if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
+      if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && always()
       run: |
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
+    - name: Print test output
+      if: steps.changes.outputs.end_to_end == 'true' && always()
+      run: |
+        # print test output
+        cat output.txt
+
     - name: Test Summary
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
+      if: steps.changes.outputs.end_to_end == 'true' && always()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "_test/junit/*.xml"
+        paths: "report.xml"
         show: "fail"

.github/workflows/cluster_endtoend_13.yml

@@ -19,6 +19,7 @@ env:
   LAUNCHABLE_ORGANIZATION: "vitess"
   LAUNCHABLE_WORKSPACE: "vitess-app"
   GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}"
+  GOPRIVATE: "github.com/slackhq/vitess-addons"
 
 jobs:
   build:
@@ -63,10 +64,14 @@ jobs:
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version-file: go.mod
 
+    - name: Setup GitHub access token
+      if: steps.changes.outputs.end_to_end == 'true'
+      run: git config --global url.https://${{ secrets.GH_ACCESS_TOKEN }}@github.com/.insteadOf https://github.com/
+
     - name: Set up python
       if: steps.changes.outputs.end_to_end == 'true'
       uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
@@ -95,6 +100,9 @@ jobs:
 
         go mod download
 
+        # install JUnit report formatter
+        go install github.com/vitessio/go-junit-report@HEAD
+
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -120,17 +128,24 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        go run test.go -docker=false -follow -shard 13
+        # run the tests however you normally do, then produce a JUnit XML file
+        go run test.go -docker=false -follow -shard 13 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
 
     - name: Record test results in launchable if PR is not a draft
-      if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
+      if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && always()
       run: |
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
+    - name: Print test output
+      if: steps.changes.outputs.end_to_end == 'true' && always()
+      run: |
+        # print test output
+        cat output.txt
+
     - name: Test Summary
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
+      if: steps.changes.outputs.end_to_end == 'true' && always()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "_test/junit/*.xml"
+        paths: "report.xml"
         show: "fail"