From 0cba4a197d07fc86292f3c029a8419e358cf0271 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sun, 9 Oct 2022 11:56:03 -0700
Subject: [PATCH] Cleanup codegen subproject scripts

Mostly really small things like linewraps and quoting.
---
 .../examples/client-go/hack/update-codegen.sh |  5 +++--
 .../hack/update-codegen.sh                    | 11 ++++++----
 .../code-generator/hack/update-codegen.sh     | 22 +++++++++++--------
 .../kube-aggregator/hack/update-codegen.sh    | 11 ++++++----
 .../src/k8s.io/metrics/hack/update-codegen.sh | 11 ++++++----
 .../sample-apiserver/hack/update-codegen.sh   | 11 ++++++----
 .../sample-controller/hack/update-codegen.sh  |  5 +++--
 7 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/hack/update-codegen.sh
index b122f64087f..577c4e6b9f0 100755
--- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/hack/update-codegen.sh
+++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/hack/update-codegen.sh
@@ -25,8 +25,9 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 # --output-base    because this script should also be able to run inside the vendor dir of
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
-bash "${CODEGEN_PKG}/generate-groups.sh" all \
-  k8s.io/apiextensions-apiserver/examples/client-go/pkg/client k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" all \
+  k8s.io/apiextensions-apiserver/examples/client-go/pkg/client \
+  k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis \
   cr:v1 \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
index a54c41f2327..e4f0cbb470e 100755
--- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
+++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
@@ -23,8 +23,9 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 
 CLIENTSET_NAME_VERSIONED=clientset \
 CLIENTSET_PKG_NAME=clientset \
-bash "${CODEGEN_PKG}/generate-groups.sh" deepcopy,client,lister,informer \
-  k8s.io/apiextensions-apiserver/pkg/client k8s.io/apiextensions-apiserver/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" "deepcopy,client,lister,informer" \
+  k8s.io/apiextensions-apiserver/pkg/client \
+  k8s.io/apiextensions-apiserver/pkg/apis \
   "apiextensions:v1beta1,v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
@@ -32,8 +33,10 @@ bash "${CODEGEN_PKG}/generate-groups.sh" deepcopy,client,lister,informer \
 CLIENTSET_NAME_VERSIONED=clientset \
 CLIENTSET_PKG_NAME=clientset \
 CLIENTSET_NAME_INTERNAL=internalclientset \
-bash "${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,conversion \
-  k8s.io/apiextensions-apiserver/pkg/client k8s.io/apiextensions-apiserver/pkg/apis k8s.io/apiextensions-apiserver/pkg/apis \
+"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,conversion" \
+  k8s.io/apiextensions-apiserver/pkg/client \
+  k8s.io/apiextensions-apiserver/pkg/apis \
+  k8s.io/apiextensions-apiserver/pkg/apis \
   "apiextensions:v1beta1,v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
diff --git a/staging/src/k8s.io/code-generator/hack/update-codegen.sh b/staging/src/k8s.io/code-generator/hack/update-codegen.sh
index 34dfc2ff2b3..ce0f073a61a 100755
--- a/staging/src/k8s.io/code-generator/hack/update-codegen.sh
+++ b/staging/src/k8s.io/code-generator/hack/update-codegen.sh
@@ -24,24 +24,28 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 # - --output-base because this script should also be able to run inside the vendor dir of
 #   k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #   instead of the $GOPATH directly. For normal projects this can be dropped.
-"$(dirname "${BASH_SOURCE[0]}")"/../generate-internal-groups.sh all \
-  k8s.io/code-generator/examples/apiserver k8s.io/code-generator/examples/apiserver/apis k8s.io/code-generator/examples/apiserver/apis \
+"${SCRIPT_ROOT}/generate-internal-groups.sh" all \
+  k8s.io/code-generator/examples/apiserver \
+  k8s.io/code-generator/examples/apiserver/apis \
+  k8s.io/code-generator/examples/apiserver/apis \
   "example:v1 example2:v1 example3.io:v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
-"$(dirname "${BASH_SOURCE[0]}")"/../generate-groups.sh all \
-  k8s.io/code-generator/examples/crd k8s.io/code-generator/examples/crd/apis \
+"${SCRIPT_ROOT}/generate-groups.sh" all \
+  k8s.io/code-generator/examples/crd \
+  k8s.io/code-generator/examples/crd/apis \
   "example:v1 example2:v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
-"$(dirname "${BASH_SOURCE[0]}")"/../generate-groups.sh all \
-  k8s.io/code-generator/examples/MixedCase k8s.io/code-generator/examples/MixedCase/apis \
+"${SCRIPT_ROOT}/generate-groups.sh" all \
+  k8s.io/code-generator/examples/MixedCase \
+  k8s.io/code-generator/examples/MixedCase/apis \
   "example:v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
-"$(dirname "${BASH_SOURCE[0]}")"/../generate-groups.sh all \
-  k8s.io/code-generator/examples/HyphenGroup k8s.io/code-generator/examples/HyphenGroup/apis \
+"${SCRIPT_ROOT}/generate-groups.sh" all \
+  k8s.io/code-generator/examples/HyphenGroup \
+  k8s.io/code-generator/examples/HyphenGroup/apis \
   "example:v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
-
diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
index 088b57c09b2..fbfc36d85bd 100755
--- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
+++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
@@ -23,8 +23,9 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 
 CLIENTSET_NAME_VERSIONED=clientset \
 CLIENTSET_PKG_NAME=clientset_generated \
-bash "${CODEGEN_PKG}/generate-groups.sh" deepcopy,client,lister,informer \
-  k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" "deepcopy,client,lister,informer" \
+  k8s.io/kube-aggregator/pkg/client \
+  k8s.io/kube-aggregator/pkg/apis \
   "apiregistration:v1beta1,v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
@@ -32,8 +33,10 @@ bash "${CODEGEN_PKG}/generate-groups.sh" deepcopy,client,lister,informer \
 CLIENTSET_NAME_VERSIONED=clientset \
 CLIENTSET_PKG_NAME=clientset_generated \
 CLIENTSET_NAME_INTERNAL=internalclientset \
-bash "${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,conversion \
-  k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis k8s.io/kube-aggregator/pkg/apis \
+"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,conversion" \
+  k8s.io/kube-aggregator/pkg/client \
+  k8s.io/kube-aggregator/pkg/apis \
+  k8s.io/kube-aggregator/pkg/apis \
   "apiregistration:v1beta1,v1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
diff --git a/staging/src/k8s.io/metrics/hack/update-codegen.sh b/staging/src/k8s.io/metrics/hack/update-codegen.sh
index d5063fdad45..633146dbf94 100755
--- a/staging/src/k8s.io/metrics/hack/update-codegen.sh
+++ b/staging/src/k8s.io/metrics/hack/update-codegen.sh
@@ -28,13 +28,16 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 #
 # we skip informers and listers for metrics, because we don't quite support the requisite operations yet
 # we skip generating the internal clientset as it's not really needed
-bash "${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,conversion \
-  k8s.io/metrics/pkg/client k8s.io/metrics/pkg/apis k8s.io/metrics/pkg/apis \
+"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,conversion" \
+  k8s.io/metrics/pkg/client \
+  k8s.io/metrics/pkg/apis \
+  k8s.io/metrics/pkg/apis \
   "metrics:v1alpha1,v1beta1 custom_metrics:v1beta1 external_metrics:v1beta1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
-bash "${CODEGEN_PKG}/generate-groups.sh" client \
-  k8s.io/metrics/pkg/client k8s.io/metrics/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" "client" \
+  k8s.io/metrics/pkg/client \
+  k8s.io/metrics/pkg/apis \
   "metrics:v1alpha1,v1beta1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
diff --git a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
index 28d6ac1a715..9fd4e236dc0 100755
--- a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
+++ b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
@@ -25,14 +25,17 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 # --output-base    because this script should also be able to run inside the vendor dir of
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
-bash "${CODEGEN_PKG}/generate-groups.sh" all \
-  k8s.io/sample-apiserver/pkg/generated k8s.io/sample-apiserver/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" all \
+  k8s.io/sample-apiserver/pkg/generated \
+  k8s.io/sample-apiserver/pkg/apis \
   "wardle:v1alpha1,v1beta1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
 
-bash "${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,defaulter,conversion,openapi" \
-  k8s.io/sample-apiserver/pkg/generated k8s.io/sample-apiserver/pkg/apis k8s.io/sample-apiserver/pkg/apis \
+"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,defaulter,conversion,openapi" \
+  k8s.io/sample-apiserver/pkg/generated \
+  k8s.io/sample-apiserver/pkg/apis \
+  k8s.io/sample-apiserver/pkg/apis \
   "wardle:v1alpha1,v1beta1" \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
diff --git a/staging/src/k8s.io/sample-controller/hack/update-codegen.sh b/staging/src/k8s.io/sample-controller/hack/update-codegen.sh
index c5fb306cc12..e71453afbe8 100755
--- a/staging/src/k8s.io/sample-controller/hack/update-codegen.sh
+++ b/staging/src/k8s.io/sample-controller/hack/update-codegen.sh
@@ -25,8 +25,9 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 # --output-base    because this script should also be able to run inside the vendor dir of
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
-bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
-  k8s.io/sample-controller/pkg/generated k8s.io/sample-controller/pkg/apis \
+"${CODEGEN_PKG}/generate-groups.sh" "deepcopy,client,informer,lister" \
+  k8s.io/sample-controller/pkg/generated \
+  k8s.io/sample-controller/pkg/apis \
   samplecontroller:v1alpha1 \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
   --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt