Update script to be vendorless

Author: cardil

.codecov.yaml

@@ -1,5 +1,3 @@
 ignore:
   - "**/zz_generated*.go" # Ignore generated files.
   - "pkg/client"
-  - "third_party"
-  - "vendor"

hack/boilerplate/add-boilerplate.sh

@@ -15,7 +15,8 @@
 # limitations under the License.
 
 
-source $(dirname $0)/../vendor/knative.dev/hack/release.sh
+# shellcheck disable=SC1090
+source "$(go run knative.dev/hack/cmd/script release.sh)"
 
 declare -A COMPONENTS
 COMPONENTS=(
@@ -43,4 +44,4 @@ function build_release() {
   ARTIFACTS_TO_PUBLISH="${all_yamls[@]}"
 }
 
-main $@
+main "$@"

hack/boilerplate/boilerplate.go.txt

@@ -18,8 +18,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname $0)/../vendor/knative.dev/hack/codegen-library.sh
-export PATH="$GOBIN:$PATH"
+# shellcheck disable=SC1090
+source "$(go run knative.dev/hack/cmd/script codegen-library.sh)"
 
 echo "=== Update Codegen for ${MODULE_NAME}"
 
@@ -28,23 +28,23 @@ group "Kubernetes Codegen"
 source "${CODEGEN_PKG}/kube_codegen.sh"
 
 kube::codegen::gen_client \
-  --boilerplate "${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt" \
+  --boilerplate "$(boilerplate)" \
   --output-dir "${REPO_ROOT_DIR}/pkg/client" \
   --output-pkg "knative.dev/sample-controller/pkg/client" \
   --with-watch \
   "${REPO_ROOT_DIR}/pkg/apis"
 
 kube::codegen::gen_helpers \
-  --boilerplate "${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt" \
+  --boilerplate "$(boilerplate)" \
   "${REPO_ROOT_DIR}/pkg"
 
 group "Knative Codegen"
 
 # Knative Injection
-${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
+"${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh" "injection" \
   knative.dev/sample-controller/pkg/client knative.dev/sample-controller/pkg/apis \
   "samples:v1alpha1" \
-  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
+  --go-header-file "$(boilerplate)"
 
 group "Update CRD Schema"
 
@@ -55,4 +55,4 @@ go run sigs.k8s.io/controller-tools/cmd/[email protected] \
 
 group "Update deps post-codegen"
 # Make sure our dependencies are up-to-date
-${REPO_ROOT_DIR}/hack/update-deps.sh
+"${REPO_ROOT_DIR}/hack/update-deps.sh"

hack/boilerplate/boilerplate.sh.txt

@@ -18,6 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+# shellcheck disable=SC1090
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 go_update_deps "$@"

hack/release.sh

@@ -18,38 +18,18 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-readonly REPO_ROOT_DIR="$(git rev-parse --show-toplevel)"
-readonly TMP_DIFFROOT="$(mktemp -d -p ${REPO_ROOT_DIR})"
-
-cleanup() {
-  rm -rf "${TMP_DIFFROOT}"
-}
-
-trap "cleanup" EXIT SIGINT
-
-cleanup
-
-# Save working tree state
-mkdir -p "${TMP_DIFFROOT}/pkg"
-cp -aR "${REPO_ROOT_DIR}/go.sum" "${REPO_ROOT_DIR}/pkg" "${REPO_ROOT_DIR}/vendor" "${TMP_DIFFROOT}"
-
-# TODO(mattmoor): We should be able to rm -rf pkg/client/ and vendor/
-
-"${REPO_ROOT_DIR}/hack/update-codegen.sh"
-echo "Diffing ${REPO_ROOT_DIR} against freshly generated codegen"
-ret=0
-diff -Naupr "${REPO_ROOT_DIR}/pkg" "${TMP_DIFFROOT}/pkg" || ret=1
-diff -Naupr --no-dereference "${REPO_ROOT_DIR}/vendor" "${TMP_DIFFROOT}/vendor" || ret=1
-
-# Restore working tree state
-rm -fr "${TMP_DIFFROOT}/config"
-rm -fr "${REPO_ROOT_DIR}/go.sum" "${REPO_ROOT_DIR}/pkg" "${REPO_ROOT_DIR}/vendor"
-cp -aR "${TMP_DIFFROOT}"/* "${REPO_ROOT_DIR}"
-
-if [[ $ret -eq 0 ]]
-then
-  echo "${REPO_ROOT_DIR} up to date."
-else
-  echo "ERROR: ${REPO_ROOT_DIR} is out of date. Please run ./hack/update-codegen.sh"
-  exit 1
+# shellcheck disable=SC1090
+source "$(go run knative.dev/hack/cmd/script library.sh)"
+
+"${REPO_ROOT_DIR}"/hack/update-codegen.sh
+
+if ! git diff --exit-code --name-only > /dev/null; then
+  error 'Modified files found:'
+  git diff --name-only
+  error 'Difference:'
+  git --no-pager diff
+  abort "${MODULE_NAME} is out of date!" "" \
+    "Please, run ./hack/build.sh -c and commit."
 fi
+
+header "${MODULE_NAME} is up to date."