slack-vitess-r14.0.5-dsdefense: backport vitessio/vitess#10619 pflag migration

.dockerignore

@@ -9,3 +9,5 @@ releases
 /vthook/
 /bin/
 /vtdataroot/
+/web/vtadmin/node_modules
+/web/vtadmin/build

.gitattributes

@@ -4,4 +4,3 @@ web/vtadmin/src/proto/*.ts -diff
 go/vt/proto/** linguist-generated=true
 go/vt/proto/*/*.pb.go -diff
 go/vt/sqlparser/sql.go linguist-generated=true -diff
-go/vt/mysqlctl/rice-box.go linguist-generated=true -diff

.github/CODEOWNERS

@@ -1,51 +1 @@
-bootstrap.sh @deepthi
-/config/mycnf/ @deepthi @shlomi-noach @mattlord
-/docker/ @derekperkins @dkhenry @mattlord
-/examples/compose @shlomi-noach
-/examples/demo @sougou @mattlord
-/examples/legacy_local @deepthi
-/examples/local @rohit-nayak-ps @frouioui @mattlord
-/examples/operator @GuptaManan100 @frouioui
-/examples/region_sharding @deepthi
-/java/ @harshit-gangal
-/go/cache @vmg
-/go/cmd @ajm188
-/go/cmd/vtadmin @ajm188 @doeg @notfelineit
-/go/cmd/vtctldclient @ajm188 @doeg @notfelineit
-/go/internal/flag @ajm188
-/go/mysql @harshit-gangal @systay @mattlord
-/go/protoutil @ajm188
-/go/test/endtoend/onlineddl @shlomi-noach
-/go/test/endtoend/orchestrator @deepthi @shlomi-noach @GuptaManan100
-/go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
-/go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
-/go/vt/discovery @deepthi
-/go/vt/mysqlctl @deepthi @mattlord
-/go/vt/orchestrator @deepthi @shlomi-noach @GuptaManan100
-/go/vt/proto/vtadmin @ajm188 @doeg @notfelineit
-/go/vt/schema @shlomi-noach
-/go/vt/servenv @deepthi @ajm188
-/go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
-/go/vt/srvtopo @rafael
-/go/vt/topo @deepthi @rafael
-/go/vt/vtadmin @ajm188 @doeg @notfelineit @rohit-nayak-ps
-/go/vt/vtctl @deepthi
-/go/vt/vtctl/vtctl.go @ajm188 @doeg @notfelineit
-/go/vt/vtctl/grpcvtctldclient @ajm188 @doeg @notfelineit
-/go/vt/vtctl/grpcvtctldserver @ajm188 @doeg @notfelineit
-/go/vt/vtctl/vtctldclient @ajm188 @doeg @notfelineit
-/go/vt/vtctld @ajm188 @deepthi @doeg @notfelineit @rohit-nayak-ps
-/go/vt/vtexplain @systay
-/go/vt/vtgate @harshit-gangal @systay @frouioui
-/go/vt/vttablet/tabletmanager @deepthi @shlomi-noach
-/go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord
-/go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
-/go/vt/vttablet/tabletserver @harshit-gangal @systay @shlomi-noach
-/go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/wrangler @deepthi @rohit-nayak-ps @mattlord
-/go/vt/workflow @rohit-nayak-ps @mattlord
-/proto/vtadmin.proto @ajm188 @doeg @notfelineit
-/proto/vtctldata.proto @ajm188 @doeg @notfelineit
-/proto/vtctlservice.proto @ajm188 @doeg @notfelineit
-/web/vtadmin @ajm188 @doeg @notfelineit
-/web/vtctld2 @doeg @notfelineit @rohit-nayak-ps
+* @slackhq/vitess

.github/pull_request_template.md

@@ -18,7 +18,7 @@
 
 ## Checklist
 
--   [ ] "Backport me!" label has been added if this change should be backported
+-   [ ] "Backport to:" labels have been added if this change should be back-ported
 -   [ ] Tests were added or are not required
 -   [ ] Documentation was added or is not required
 

.github/workflows/check_make_vtadmin_authz_testgen.yml

@@ -4,12 +4,25 @@ jobs:
 
   build:
     name: Check Make vtadmin_authz_testgen
-    runs-on: ubuntu-latest
+    runs-on:
+      group: vitess-ubuntu20
     steps:
+    - name: Check if workflow needs to be skipped
+      id: skip-workflow
+      run: |
+        skip='false'
+        if [[ "${{github.event.pull_request}}" ==  "" ]] && [[ "${{github.ref}}" != "refs/heads/main" ]] && [[ ! "${{github.ref}}" =~ ^refs/heads/release-[0-9]+\.[0-9]$ ]] && [[ ! "${{github.ref}}" =~ "refs/tags/.*" ]]; then
+          skip='true'
+        fi
+        echo Skip ${skip}
+        echo "skip-workflow=${skip}" >> $GITHUB_OUTPUT
+
     - name: Check out code
-      uses: actions/checkout@v2
+      if: steps.skip-workflow.outputs.skip-workflow == 'false'
+      uses: actions/checkout@v3
 
     - name: Check for changes in relevant files
+      if: steps.skip-workflow.outputs.skip-workflow == 'false'
       uses: frouioui/paths-filter@main
       id: changes
       with:
@@ -19,24 +32,26 @@ jobs:
             - 'bootstrap.sh'
             - 'tools/**'
             - 'build.env'
-            - 'go.[sumod]'
+            - 'go.sum'
+            - 'go.mod'
             - 'Makefile'
             - 'go/vt/vtadmin/**'
+            - '.github/workflows/check_make_vtadmin_authz_testgen.yml'
 
     - name: Set up Go
-      uses: actions/setup-go@v2
-      if: steps.changes.outputs.vtadmin_changes == 'true'
+      uses: actions/setup-go@v3
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       with:
-        go-version: 1.18.3
+        go-version: 1.19.10
 
     - name: Tune the OS
-      if: steps.changes.outputs.vtadmin_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       run: |
         echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
 
 
     - name: Get dependencies
-      if: steps.changes.outputs.vtadmin_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       run: |
         sudo apt-get update
         sudo apt-get install -y make unzip g++ etcd curl git wget
@@ -45,11 +60,11 @@ jobs:
         go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run make minimaltools
-      if: steps.changes.outputs.vtadmin_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       run: |
         make minimaltools
 
     - name: check_make_vtadmin_authz_testgen
-      if: steps.changes.outputs.vtadmin_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       run: |
         tools/check_make_vtadmin_authz_testgen.sh

.github/workflows/check_make_vtadmin_web_proto.yml

@@ -6,10 +6,22 @@ jobs:
     name: Check Make VTAdmin Web Proto
     runs-on: ubuntu-latest
     steps:
+    - name: Check if workflow needs to be skipped
+      id: skip-workflow
+      run: |
+        skip='false'
+        if [[ "${{github.event.pull_request}}" ==  "" ]] && [[ "${{github.ref}}" != "refs/heads/main" ]] && [[ ! "${{github.ref}}" =~ ^refs/heads/release-[0-9]+\.[0-9]$ ]] && [[ ! "${{github.ref}}" =~ "refs/tags/.*" ]]; then
+          skip='true'
+        fi
+        echo Skip ${skip}
+        echo "skip-workflow=${skip}" >> $GITHUB_OUTPUT
+
     - name: Check out code
-      uses: actions/checkout@v2
+      if: steps.skip-workflow.outputs.skip-workflow == 'false'
+      uses: actions/checkout@v3
 
     - name: Check for changes in relevant files
+      if: steps.skip-workflow.outputs.skip-workflow == 'false'
       uses: frouioui/paths-filter@main
       id: changes
       with:
@@ -19,31 +31,33 @@ jobs:
             - 'bootstrap.sh'
             - 'tools/**'
             - 'build.env'
-            - 'go.[sumod]'
+            - 'go.sum'
+            - 'go.mod'
             - 'Makefile'
             - 'go/vt/proto/**'
             - 'proto/*.proto'
             - 'web/vtadmin/src/proto/**'
+            - '.github/workflows/check_make_vtadmin_web_proto.yml'
 
     - name: Set up Go
-      uses: actions/setup-go@v2
-      if: steps.changes.outputs.proto_changes == 'true'
+      uses: actions/setup-go@v3
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'
       with:
-        go-version: 1.18.3
+        go-version: 1.19.10
 
     - name: Setup Node
-      if: steps.changes.outputs.proto_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'
       uses: actions/setup-node@v2
       with:
         # node-version should match package.json
         node-version: '16.13.0'
 
     - name: Install npm dependencies
-      if: steps.changes.outputs.proto_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'
       run: npm ci
       working-directory: ./web/vtadmin
 
     - name: check_make_vtadmin_web_proto
-      if: steps.changes.outputs.proto_changes == 'true'
+      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'
       run: |
         tools/check_make_vtadmin_web_proto.sh