upgrade to latest dependencies (#1426)

bumping knative.dev/hack 9c9eed6...b979959:

Signed-off-by: Knative Automation <automation@knative.team>

go.mod

@@ -21,7 +21,7 @@ require (
 	k8s.io/code-generator v0.29.2
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 	knative.dev/eventing v0.42.0
-	knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679
+	knative.dev/hack v0.0.0-20240704013904-b9799599afcf
 	knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
 	knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470
 	sigs.k8s.io/controller-runtime v0.15.2

go.sum

@@ -823,8 +823,8 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 knative.dev/eventing v0.42.0 h1:pbPPhV4JlgpHBZxLBhJTUf+4HuZe5y/zlkOGHZfvtZ0=
 knative.dev/eventing v0.42.0/go.mod h1:hW5BMYcihtCelT9pqaMtK8gmNOo1ybxcigjBY+/fU+k=
-knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679 h1:tvbANb4KIO91DT1FGR4yCLA5E0qAmIeQ3DAGOkZGg4k=
-knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
+knative.dev/hack v0.0.0-20240704013904-b9799599afcf h1:n92FmZRywgtHso7pFAku7CW0qvRAs1hXtMQqO0R6eiE=
+knative.dev/hack v0.0.0-20240704013904-b9799599afcf/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
 knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
 knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw=
 knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470 h1:cdAPZPUszOYpgJY2LNRzz6lFZgD++U89y56jECV/6eU=

vendor/knative.dev/hack/codegen-library.sh

@@ -16,156 +16,21 @@
 
 # Setup the env for doing Knative style codegen.
 
-# Store Bash options
-oldstate="$(set +o)"
-
-set -Eeuo pipefail
-
-export repodir kn_hack_dir kn_hack_library \
-  MODULE_NAME CODEGEN_TMP_GOPATH CODEGEN_ORIGINAL_GOPATH GOPATH GOBIN \
-  CODEGEN_PKG KNATIVE_CODEGEN_PKG
-
-kn_hack_dir="$(realpath "$(dirname "${BASH_SOURCE[0]:-$0}")")"
-kn_hack_library=${kn_hack_library:-"${kn_hack_dir}/library.sh"}
+kn_hack_library=${kn_hack_library:-"$(dirname $0)/../vendor/knative.dev/hack/library.sh"}
 
 if [[ -f "$kn_hack_library" ]]; then
-  # shellcheck disable=SC1090
-  source "$kn_hack_library"
+  source $kn_hack_library
 else
-  echo "The \$kn_hack_library points to a non-existent file: $kn_hack_library" >&2
-  exit 42
+  echo "this file is intended to be imported from a golang project that vendors knative.dev/hack"
+  exit
 fi
 
-repodir="$(go_run knative.dev/toolbox/modscope@latest current --path)"
-
-function go-resolve-pkg-dir() {
-  local pkg="${1:?Pass the package name}"
-  local pkgdir
-  if [ -d "${repodir}/vendor" ]; then
-    pkgdir="${repodir}/vendor/${pkg}"
-    if [ -d "${pkgdir}" ]; then
-      echo "${pkgdir}"
-      return 0
-    else
-      return 1
-    fi
-  else
-    go mod download -x > /dev/stderr
-    go list -m -f '{{.Dir}}' "${pkg}" 2>/dev/null
-    return $?
-  fi
-}
-
-# Change dir to the original executing script's directory, not the current source!
-pushd "$(dirname "$(realpath "$0")")" > /dev/null
-
-if ! CODEGEN_PKG="${CODEGEN_PKG:-"$(go-resolve-pkg-dir k8s.io/code-generator)"}"; then
-  warning "Failed to determine the k8s.io/code-generator package"
-fi
-if ! KNATIVE_CODEGEN_PKG="${KNATIVE_CODEGEN_PKG:-"$(go-resolve-pkg-dir knative.dev/pkg)"}"; then
-  warning "Failed to determine the knative.dev/pkg package"
-fi
-
-popd > /dev/null
-
-CODEGEN_ORIGINAL_GOPATH="$(go env GOPATH)"
-CODEGEN_TMP_GOPATH=$(go_mod_gopath_hack)
-GOPATH="${CODEGEN_TMP_GOPATH}"
-GOBIN="${GOPATH}/bin" # Set GOBIN explicitly as k8s-gen' are installed by go install.
-
-if [[ -n "${CODEGEN_PKG}" ]] && ! [ -x "${CODEGEN_PKG}/generate-groups.sh" ]; then
-  chmod +x "${CODEGEN_PKG}/generate-groups.sh"
-  chmod +x "${CODEGEN_PKG}/generate-internal-groups.sh"
-fi
-if [[ -n "${KNATIVE_CODEGEN_PKG}" ]] && ! [ -x "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" ]; then
-  chmod +x "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh"
-fi
-
-# Generate boilerplate file with the current year
-function boilerplate() {
-  local go_header_file="${kn_hack_dir}/boilerplate.go.txt"
-  local current_boilerplate_file="${TMPDIR}/boilerplate.go.txt"
-  # Replace #{YEAR} with the current year
-  sed "s/#{YEAR}/$(date +%Y)/" \
-    < "${go_header_file}" \
-    > "${current_boilerplate_file}"
-  echo "${current_boilerplate_file}"
-}
-
-# Generate K8s' groups codegen
-function generate-groups() {
-  if [[ -z "${CODEGEN_PKG}" ]]; then
-    abort "CODEGEN_PKG is not set"
-  fi
-  "${CODEGEN_PKG}"/generate-groups.sh \
-    "$@" \
-    --go-header-file "$(boilerplate)"
-}
-
-# Generate K8s' internal groups codegen
-function generate-internal-groups() {
-  if [[ -z "${CODEGEN_PKG}" ]]; then
-    abort "CODEGEN_PKG is not set"
-  fi
-  "${CODEGEN_PKG}"/generate-internal-groups.sh \
-    "$@" \
-    --go-header-file "$(boilerplate)"
-}
-
-# Generate Knative style codegen
-function generate-knative() {
-  if [[ -z "${KNATIVE_CODEGEN_PKG}" ]]; then
-    abort "KNATIVE_CODEGEN_PKG is not set"
-  fi
-  "${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" \
-    "$@" \
-    --go-header-file "$(boilerplate)"
-}
-
-# Cleanup after generating code
-function cleanup-codegen() {
-  restore-changes-if-its-copyright-year-only
-  restore-gopath
-}
-
-# Restore changes if the file contains only the change in the copyright year
-function restore-changes-if-its-copyright-year-only() {
-  local difflist
-  log "Cleaning up generated code"
-  difflist="$(mktemp)"
-  git diff --exit-code --name-only > "$difflist"
-  # list git changes and skip those which differ only in the boilerplate year
-  while read -r file; do
-    # check if the file contains just the change in the boilerplate year
-    if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
-        [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then
-      # restore changes to that file
-      git checkout -- "$file"
-    fi
-  done < "$difflist"
-  rm -f "$difflist"
-}
-
-# Restore the GOPATH and clean up the temporary directory
-function restore-gopath() {
-  # Skip this if the directory is already checked out onto the GOPATH.
-  if __is_checkout_onto_gopath; then
-    return
-  fi
-  if [ -d "$CODEGEN_TMP_GOPATH" ]; then
-    chmod -R u+w "${CODEGEN_TMP_GOPATH}"
-    rm -rf "${CODEGEN_TMP_GOPATH}"
-    unset CODEGEN_TMP_GOPATH
-  fi
-  unset GOPATH GOBIN
-  # Restore the original GOPATH, if it was different from the default one.
-  if [ "$CODEGEN_ORIGINAL_GOPATH" != "$(go env GOPATH)" ]; then
-    export GOPATH="$CODEGEN_ORIGINAL_GOPATH"
-  fi
-  unset CODEGEN_ORIGINAL_GOPATH
-}
-
-add_trap cleanup-codegen EXIT
+export MODULE_NAME=$(go_mod_module_name)
+export GOPATH=$(go_mod_gopath_hack)
+export GOBIN=${GOPATH}/bin # Set GOBIN explicitly as deepcopy-gen is installed by go install.
+export CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+export KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo "${REPO_ROOT_DIR}")}
 
-# Restore Bash options
-eval "$oldstate"
+[ -x ${CODEGEN_PKG}/generate-groups.sh ] || chmod +x ${CODEGEN_PKG}/generate-groups.sh
+[ -x ${CODEGEN_PKG}/generate-internal-groups.sh ] || chmod +x ${CODEGEN_PKG}/generate-internal-groups.sh
+[ -x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh ] || chmod +x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh

vendor/knative.dev/hack/embed.go

@@ -20,5 +20,5 @@ import (
 	"embed"
 )
 
-//go:embed *.sh *.go.txt
+//go:embed *.sh
 var Scripts embed.FS

vendor/knative.dev/hack/go.work

@@ -1,4 +1,4 @@
-go 1.21
+go 1.18
 
 use (
 	.