Regenerate generated code. (#15917)

- Migrate code gen to use latest tools container.

- Stop using the go_generate_dependencies docker image, use the canonical build tools
image instead.

.commonfiles.sha

@@ -1 +1 @@
-0ffcb226039323b7f5b9deb4d34de5193c372537
+2b4f0140d1f92b29a95fd8e9967b3c4fac4bc548

bin/counterfeiter.sh

@@ -22,7 +22,7 @@ if [ "$ROOTDIR" != "${GOPATH-$HOME/go}/src/istio.io/istio" ]; then
   die "Istio not found in GOPATH/src/istio.io/"
 fi
 
-gen_img=gcr.io/istio-testing/go_generate_dependency:2018-07-26
+gen_img=gcr.io/istio-testing/api-build-tools:2019-07-30
 
 docker run  -i --volume /var/run/docker.sock:/var/run/docker.sock \
   -e "GOPATH=/go:$GOPATH" --rm --entrypoint counterfeiter -v "$ROOTDIR:$ROOTDIR" -w "$(pwd)" $gen_img "$@"

bin/protoc.sh

@@ -27,7 +27,7 @@ if [ "$ROOTDIR" != "${GOPATH-$HOME/go}/src/istio.io/istio" ]; then
   die "Istio not found in GOPATH/src/istio.io/"
 fi
 
-gen_img=gcr.io/istio-testing/protoc:2019-03-29
+gen_img=gcr.io/istio-testing/api-build-tools:2019-07-30
 
 docker run  -i --volume /var/run/docker.sock:/var/run/docker.sock \
   --rm --entrypoint /usr/bin/protoc -v "$ROOTDIR:$ROOTDIR" -w "$(pwd)" $gen_img "$@"

galley/pkg/config/processor/metadata/gen.go

@@ -16,7 +16,7 @@ package metadata
 
 // TODO: Switch go-bindata to be scripts/run_gobindata.sh
 // Embed the core metadata file containing the collections as a resource
-//go:generate go-bindata --nocompress --nometadata --pkg metadata -o metadata.gen.go metadata.yaml
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg metadata -o metadata.gen.go metadata.yaml
 
 // Create static initializers file
 //go:generate go run $GOPATH/src/istio.io/istio/galley/pkg/config/schema/codegen/tools/staticinit.main.go metadata metadata.yaml staticinit.gen.go

galley/pkg/config/testing/basicmeta/gen.go

@@ -15,7 +15,7 @@
 package basicmeta
 
 // Embed the core metadata file containing the collections as a resource
-//go:generate go-bindata --nocompress --nometadata --pkg basicmeta -o basicmeta.gen.go basicmeta.yaml basicmeta2.yaml
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg basicmeta -o basicmeta.gen.go basicmeta.yaml basicmeta2.yaml
 
 // Create static initializers file
 //go:generate go run $GOPATH/src/istio.io/istio/galley/pkg/config/schema/codegen/tools/staticinit.main.go basicmeta basicmeta.yaml staticinit.gen.go

galley/pkg/config/testing/data/builtin.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Embed the core metadata file containing the collections as a resource
-//go:generate go-bindata --nocompress --nometadata --pkg data -o builtin.gen.go builtin/
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg data -o builtin.gen.go builtin/
 
 package data
 

galley/pkg/config/testing/data/builtin/get.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Embed the core metadata file containing the collections as a resource
-//go:generate go-bindata --nocompress --nometadata --pkg builtin -o builtin.gen.go testdata/
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg builtin -o builtin.gen.go testdata/
 
 package builtin
 

galley/pkg/config/testing/k8smeta/gen.go

@@ -15,7 +15,7 @@
 package k8smeta
 
 // Embed the core metadata file containing the collections as a resource
-//go:generate go-bindata --nocompress --nometadata --pkg k8smeta -o k8smeta.gen.go  k8smeta.yaml
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg k8smeta -o k8smeta.gen.go  k8smeta.yaml
 
 // Create static initializers file
 //go:generate go run $GOPATH/src/istio.io/istio/galley/pkg/config/schema/codegen/tools/staticinit.main.go k8smeta k8smeta.yaml staticinit.gen.go

galley/testdata/conversion/dataset.go

@@ -14,4 +14,4 @@
 
 package conversion
 
-//go:generate $GOPATH/src/istio.io/istio/bin/go-bindata.sh --nocompress --nometadata --pkg conversion -o dataset.gen.go dataset/...
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg conversion -o dataset.gen.go dataset/...

galley/testdata/validation/dataset.go

@@ -14,5 +14,5 @@
 
 package validation
 
-//go:generate $GOPATH/src/istio.io/istio/bin/go-bindata.sh --nocompress --nometadata --pkg validation -o dataset.gen.go dataset/...
+//go:generate $GOPATH/src/istio.io/istio/scripts/run_gobindata.sh --nocompress --nometadata --pkg validation -o dataset.gen.go dataset/...
 //go:generate goimports -w dataset.gen.go