slack-vitess-r14.0.4-dsdefense branch: initial cherry-picks, part 1

docker/base/Dockerfile

@@ -32,6 +32,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

docker/base/Dockerfile.mariadb

@@ -9,6 +9,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

docker/base/Dockerfile.mariadb103

@@ -9,6 +9,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

docker/base/Dockerfile.mysql80

@@ -9,6 +9,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

docker/base/Dockerfile.percona57

@@ -9,6 +9,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

docker/base/Dockerfile.percona80

@@ -9,6 +9,12 @@ ARG CGO_ENABLED=0
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER
 
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
 # Re-copy sources from working tree
 USER root
 COPY . /vt/src/vitess.io/vitess

go.mod

@@ -3,7 +3,7 @@ module vitess.io/vitess
 go 1.18
 
 require (
- cloud.google.com/go/storage v1.10.0
+ cloud.google.com/go/storage v1.14.0
  github.com/AdaLogics/go-fuzz-headers v0.0.0-20211102141018-f7be0cbad29c
  github.com/Azure/azure-pipeline-go v0.2.2
  github.com/Azure/azure-storage-blob-go v0.10.0
@@ -27,7 +27,7 @@ require (
  github.com/golang/mock v1.5.0
  github.com/golang/protobuf v1.5.2
  github.com/golang/snappy v0.0.1
- github.com/google/go-cmp v0.5.6
+ github.com/google/go-cmp v0.5.9
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
  github.com/google/uuid v1.3.0
  github.com/googleapis/gnostic v0.4.1 // indirect
@@ -53,7 +53,7 @@ require (
  github.com/martini-contrib/auth v0.0.0-20150219114609-fa62c19b7ae8
  github.com/martini-contrib/gzip v0.0.0-20151124214156-6c035326b43f
  github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11
- github.com/mattn/go-sqlite3 v1.14.6
+ github.com/mattn/go-sqlite3 v1.14.15
  github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
  github.com/mitchellh/go-testing-interface v1.14.0 // indirect
  github.com/montanaflynn/stats v0.6.3
@@ -77,7 +77,7 @@ require (
  github.com/spf13/pflag v1.0.5
  github.com/spf13/viper v1.8.1
  github.com/spyzhov/ajson v0.4.2
- github.com/stretchr/testify v1.7.1
+ github.com/stretchr/testify v1.8.1
  github.com/tchap/go-patricia v2.2.6+incompatible
  github.com/tebeka/selenium v0.9.9
  github.com/tidwall/gjson v1.12.1
@@ -91,15 +91,15 @@ require (
  go.etcd.io/etcd/client/pkg/v3 v3.5.0
  go.etcd.io/etcd/client/v3 v3.5.0
  golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
- golang.org/x/mod v0.5.1 // indirect
- golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
+ golang.org/x/mod v0.6.0 // indirect
+ golang.org/x/net v0.1.0
  golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
- golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
- golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
- golang.org/x/text v0.3.7
+ golang.org/x/sync v0.1.0
+ golang.org/x/sys v0.4.0 // indirect
+ golang.org/x/term v0.1.0
+ golang.org/x/text v0.4.0
  golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
- golang.org/x/tools v0.1.9
+ golang.org/x/tools v0.2.0
  google.golang.org/api v0.45.0
  google.golang.org/genproto v0.0.0-20210701191553-46259e63a0a9 // indirect
  google.golang.org/grpc v1.45.0
@@ -120,7 +120,10 @@ require (
  sigs.k8s.io/yaml v1.2.0
 )
 
-require github.com/bndr/gotabulate v1.1.2
+require (
+ github.com/bndr/gotabulate v1.1.2
+ github.com/shirou/gopsutil/v3 v3.23.1
+)
 
 require (
  cloud.google.com/go v0.81.0 // indirect
@@ -138,6 +141,7 @@ require (
  github.com/fatih/color v1.9.0 // indirect
  github.com/felixge/httpsnoop v1.0.1 // indirect
  github.com/go-logr/logr v0.2.0 // indirect
+ github.com/go-ole/go-ole v1.2.6 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
  github.com/google/gofuzz v1.1.0 // indirect
@@ -147,47 +151,53 @@ require (
  github.com/hashicorp/go-rootcerts v1.0.2 // indirect
  github.com/hashicorp/golang-lru v0.5.1 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
- github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/jessevdk/go-flags v1.4.0 // indirect
- github.com/json-iterator/go v1.1.11 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
  github.com/jstemmer/go-junit-report v0.9.1 // indirect
- github.com/kr/pretty v0.2.1 // indirect
- github.com/mattn/go-colorable v0.1.6 // indirect
- github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d // indirect
- github.com/mattn/go-isatty v0.0.12 // indirect
- github.com/mattn/go-runewidth v0.0.7 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/kr/pretty v0.3.1 // indirect
+ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+ github.com/mattn/go-colorable v0.1.13 // indirect
+ github.com/mattn/go-ieproxy v0.0.9 // indirect
+ github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/mapstructure v1.4.1 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 // indirect
  github.com/onsi/ginkgo v1.12.1 // indirect
  github.com/onsi/gomega v1.10.3 // indirect
  github.com/pelletier/go-toml v1.9.3 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/procfs v0.6.0 // indirect
+ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
+ github.com/prometheus/procfs v0.9.0 // indirect
+ github.com/rivo/uniseg v0.4.3 // indirect
  github.com/satori/go.uuid v1.2.0 // indirect
- github.com/spf13/afero v1.6.0 // indirect
- github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/afero v1.9.3 // indirect
+ github.com/spf13/cast v1.5.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/subosito/gotenv v1.2.0 // indirect
  github.com/tidwall/match v1.1.1 // indirect
  github.com/tidwall/pretty v1.2.0 // indirect
+ github.com/tklauser/go-sysconf v0.3.11 // indirect
+ github.com/tklauser/numcpus v0.6.0 // indirect
  github.com/valyala/bytebufferpool v1.0.0 // indirect
  github.com/valyala/fasttemplate v1.0.1 // indirect
- go.opencensus.io v0.23.0 // indirect
- go.uber.org/atomic v1.7.0 // indirect
- go.uber.org/multierr v1.6.0 // indirect
- go.uber.org/zap v1.17.0 // indirect
- golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+ github.com/yusufpapurcu/wmi v1.2.2 // indirect
+ go.opencensus.io v0.24.0 // indirect
+ go.uber.org/atomic v1.10.0 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ go.uber.org/zap v1.23.0 // indirect
+ golang.org/x/crypto v0.1.0 // indirect
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/ini.v1 v1.62.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  k8s.io/api v0.20.6 // indirect
  k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac // indirect
  k8s.io/klog v1.0.0 // indirect