Updates codegen scripts from hack

With the update of k8s dependencies, most of the codegen commands
changed (different flags, …), so this is adapting them.

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

hack/generate-groups.sh

@@ -18,7 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-
 # generate-groups generates everything for a project with external types only, e.g. a project based
 # on CustomResourceDefinitions.
 
@@ -40,6 +39,7 @@ fi
 
 GENS="$1"
 OUTPUT_PKG="$2"
+OUTPUT_PATH=".${OUTPUT_PKG#github.com/tektoncd/pipeline}"
 APIS_PKG="$3"
 GROUPS_WITH_VERSIONS="$4"
 shift 4
@@ -68,25 +68,25 @@ done
 
 if [ "${GENS}" = "all" ] || grep -qw "deepcopy" <<<"${GENS}"; then
   echo "Generating deepcopy funcs for ${GROUPS_WITH_VERSIONS}"
-  "${PREFIX}/deepcopy-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${APIS_PKG}" "$@"
+  "${PREFIX}/deepcopy-gen" --output-file zz_generated.deepcopy.go --bounding-dirs "${APIS_PKG}" "$@" $(codegen::join " " "${FQ_APIS[@]}")
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "client" <<<"${GENS}"; then
   echo "Generating clientset for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}"
-  "${PREFIX}/client-gen" --clientset-name "${CLIENTSET_NAME_VERSIONED:-versioned}" --input-base "" --input "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" "$@"
+  "${PREFIX}/client-gen" --clientset-name "${CLIENTSET_NAME_VERSIONED:-versioned}" --input-base "" --input "$(codegen::join , "${FQ_APIS[@]}")" --output-pkg "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" --output-dir "${OUTPUT_PATH}/${CLIENTSET_PKG_NAME:-clientset}" "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "lister" <<<"${GENS}"; then
   echo "Generating listers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/listers"
-  "${PREFIX}/lister-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/listers" "$@"
+  "${PREFIX}/lister-gen" --output-pkg "${OUTPUT_PKG}/listers" --output-dir "${OUTPUT_PATH}/listers" "$@" $(codegen::join " " "${FQ_APIS[@]}")
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "informer" <<<"${GENS}"; then
   echo "Generating informers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/informers"
   "${PREFIX}/informer-gen" \
-           --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" \
            --versioned-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned}" \
            --listers-package "${OUTPUT_PKG}/listers" \
-           --output-package "${OUTPUT_PKG}/informers" \
-           "$@"
+           --output-pkg "${OUTPUT_PKG}/informers" \
+           --output-dir "${OUTPUT_PATH}/informers" \
+           "$@" $(codegen::join " " "${FQ_APIS[@]}")
 fi

hack/update-codegen.sh

@@ -47,37 +47,37 @@ bash ${REPO_ROOT_DIR}/hack/generate-groups.sh "deepcopy,client,informer,lister"
   github.com/tektoncd/pipeline/pkg/client github.com/tektoncd/pipeline/pkg/apis \
   "pipeline:v1alpha1,v1beta1,v1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
-# This generates deepcopy,client,informer and lister for the resolution package (v1alpha1)
+# This generates deepcopy,client,informer and lister for the resolution package (v1alpha1, v1beta1)
 bash ${REPO_ROOT_DIR}/hack/generate-groups.sh "deepcopy,client,informer,lister" \
   github.com/tektoncd/pipeline/pkg/client/resolution github.com/tektoncd/pipeline/pkg/apis \
   "resolution:v1alpha1,v1beta1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Depends on generate-groups.sh to install bin/deepcopy-gen
 ${PREFIX}/deepcopy-gen \
-  -O zz_generated.deepcopy \
+  --output-file zz_generated.deepcopy.go \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
-  -i github.com/tektoncd/pipeline/pkg/apis/config
+  github.com/tektoncd/pipeline/pkg/apis/config
 
 ${PREFIX}/deepcopy-gen \
-  -O zz_generated.deepcopy \
+  --output-file zz_generated.deepcopy.go \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
-  -i github.com/tektoncd/pipeline/pkg/spire/config
+  github.com/tektoncd/pipeline/pkg/spire/config
 
 ${PREFIX}/deepcopy-gen \
-  -O zz_generated.deepcopy \
+  --output-file zz_generated.deepcopy.go \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
-  -i github.com/tektoncd/pipeline/pkg/apis/config/resolver
+  github.com/tektoncd/pipeline/pkg/apis/config/resolver
 
 ${PREFIX}/deepcopy-gen \
-  -O zz_generated.deepcopy \
+  --output-file zz_generated.deepcopy.go \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
--i github.com/tektoncd/pipeline/pkg/apis/pipeline/pod
+  github.com/tektoncd/pipeline/pkg/apis/pipeline/pod
 
 ${PREFIX}/deepcopy-gen \
-  -O zz_generated.deepcopy \
+  --output-file zz_generated.deepcopy.go \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
--i github.com/tektoncd/pipeline/pkg/apis/run/v1alpha1
+  github.com/tektoncd/pipeline/pkg/apis/run/v1alpha1
 
 # Knative Injection
 

hack/update-openapigen.sh

@@ -36,18 +36,21 @@ trap cleanup EXIT
 
 for APIVERSION in "v1alpha1" "v1beta1" "v1"
 do
-  input_dirs=./pkg/apis/pipeline/${APIVERSION},./pkg/apis/pipeline/pod,knative.dev/pkg/apis,knative.dev/pkg/apis/duck/v1beta1
+  input_dirs="./pkg/apis/pipeline/${APIVERSION} ./pkg/apis/pipeline/pod knative.dev/pkg/apis knative.dev/pkg/apis/duck/v1beta1"
   if [ ${APIVERSION} = "v1beta1" ]
   then
-    input_dirs=${input_dirs},./pkg/apis/resolution/v1beta1
+    input_dirs="${input_dirs} ./pkg/apis/resolution/v1beta1"
   fi
 
+  set -x
+
   echo "Generating OpenAPI specification for ${APIVERSION} ..."
-  go run k8s.io/kube-openapi/cmd/openapi-gen \
-      --input-dirs ${input_dirs} \
-      --output-package ./pkg/apis/pipeline/${APIVERSION} -o ./ \
+  GOFLAGS="-mod=mod" go run k8s.io/kube-openapi/cmd/openapi-gen \
+     --output-pkg github.com/tektoncd/pipeline/pkg/apis/pipeline/${APIVERSION} \
+     --output-dir ./pkg/apis/pipeline/${APIVERSION} \
+     --output-file openapi_generated.go \
       --go-header-file hack/boilerplate/boilerplate.go.txt \
-      -r "${TMP_DIFFROOT}/api-report"
+      -r "${TMP_DIFFROOT}/api-report" ${input_dirs}
 
   violations=$(diff --changed-group-format='%>' --unchanged-group-format='' <(sort "hack/ignored-openapi-violations.list") <(sort "${TMP_DIFFROOT}/api-report") || echo "")
   if [ -n "${violations}" ]; then