Update codegen (buildpacks-community#1848)

* Update codegen script to use kube_codegen

Signed-off-by: Tom Kennedy <tom.kennedy@broadcom.com>

* Run codegenerator

Signed-off-by: Tom Kennedy <tom.kennedy@broadcom.com>

* Update openapi codegen

Signed-off-by: Tom Kennedy <tom.kennedy@broadcom.com>

---------

Signed-off-by: Tom Kennedy <tom.kennedy@broadcom.com>

Author: tomkennedy513

api/openapi-spec/swagger.json

@@ -5704,8 +5704,7 @@
     "kpack.build.v1alpha2.BuildStatus": {
       "type": "object",
       "required": [
-        "lifecycleVersion",
-        "lifecycleCommit"
+        "lifecycleVersion"
       ],
       "properties": {
         "buildMetadata": {
@@ -5734,10 +5733,6 @@
         "latestImage": {
           "type": "string"
         },
-        "lifecycleCommit": {
-          "type": "string",
-          "default": ""
-        },
         "lifecycleVersion": {
           "type": "string",
           "default": ""

go.sum

@@ -489,12 +489,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
-github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
 github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
-github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U=
-github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
 github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
 github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=

hack/openapi-codegen.sh

@@ -9,15 +9,16 @@ ROOT=$(realpath $(dirname ${BASH_SOURCE})/..)
 cd "$ROOT"
 
 go run k8s.io/kube-openapi/cmd/openapi-gen \
-  -h ./hack/boilerplate/boilerplate.go.txt \
-  -i github.com/pivotal/kpack/pkg/apis/build/v1alpha1,github.com/pivotal/kpack/pkg/apis/build/v1alpha2,github.com/pivotal/kpack/pkg/apis/core/v1alpha1 \
-  -p ./pkg/openapi \
-  -o ./
+  --go-header-file ./hack/boilerplate/boilerplate.go.txt \
+  --output-pkg openapi \
+  --output-dir ./pkg/openapi \
+    github.com/pivotal/kpack/pkg/apis/build/v1alpha1 github.com/pivotal/kpack/pkg/apis/build/v1alpha2 github.com/pivotal/kpack/pkg/apis/core/v1alpha1 
 
 # VolatileTime has custom json encoding/decoding that does not map to a proper json schema. Use a basic string instead.
-sed -i.old 's/Ref\:         ref(\"github.com\/pivotal\/kpack\/pkg\/apis\/core\/v1alpha1.VolatileTime\"),/Type: []string{\"string\"}, Format: \"\",/g' pkg/openapi/openapi_generated.go
-sed -i.old 's/Ref\:         ref(\"github.com\/pivotal\/kpack\/pkg\/apis\/core\/v1alpha2.VolatileTime\"),/Type: []string{\"string\"}, Format: \"\",/g' pkg/openapi/openapi_generated.go
+sed -i.old 's/Ref\:         ref(\"github.com\/pivotal\/kpack\/pkg\/apis\/core\/v1alpha1.VolatileTime\"),/Type: []string{\"string\"}, Format: \"\",/g' pkg/openapi/generated.openapi.go
+sed -i.old 's/Ref\:         ref(\"github.com\/pivotal\/kpack\/pkg\/apis\/core\/v1alpha2.VolatileTime\"),/Type: []string{\"string\"}, Format: \"\",/g' pkg/openapi/generated.openapi.go
 
 go run ./hack/openapi/main.go 1> ./api/openapi-spec/swagger.json
+rm -f pkg/openapi/generated.openapi.go.old
 
 cd -

hack/update-codegen.sh

@@ -6,28 +6,18 @@ set -o pipefail
 
 SCRIPT_ROOT=$(realpath $(dirname ${BASH_SOURCE})/..)
 
-pushd $SCRIPT_ROOT
-  go mod vendor
-popd
-trap 'rm -rf $SCRIPT_ROOT/vendor' EXIT
+CODEGEN_PKG=$(go list -m -mod=readonly -f "{{.Dir}}" k8s.io/code-generator)
+source "${CODEGEN_PKG}"/kube_codegen.sh
 
-CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+kube::codegen::gen_helpers \
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.go.txt \
+  "${SCRIPT_ROOT}/pkg/apis"
 
-TMP_DIR="$(mktemp -d)"
-trap 'rm -rf ${TMP_DIR} && rm -rf $SCRIPT_ROOT/vendor' EXIT
-export GOPATH=${GOPATH:-${TMP_DIR}}
+kube::codegen::gen_client \
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.go.txt \
+  --output-dir "${SCRIPT_ROOT}/pkg/client" \
+  --output-pkg "github.com/pivotal/kpack/pkg/client" \
+  --with-watch \
+  "${SCRIPT_ROOT}/pkg/apis"
 
-TMP_REPO_PATH="${TMP_DIR}/src/github.com/pivotal/kpack"
-mkdir -p "$(dirname "${TMP_REPO_PATH}")" && ln -s "${SCRIPT_ROOT}" "${TMP_REPO_PATH}"
-
-bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
-  github.com/pivotal/kpack/pkg/client github.com/pivotal/kpack/pkg/apis \
-  "build:v1alpha1,v1alpha2" \
-  --output-base "${TMP_DIR}/src" \
-  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.go.txt
-
-bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy" \
-  github.com/pivotal/kpack/pkg/client github.com/pivotal/kpack/pkg/apis \
-  "core:v1alpha1" \
-  --output-base "${TMP_DIR}/src" \
-  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.go.txt
+go mod tidy