Update/verify dep vendoring

LICENSES/github.com/google/go-cmp/cmp/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2017 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

hack/third_party/kubernetes/verify-shellcheck.sh

@@ -62,7 +62,8 @@ if [[ "$#" == 0 ]]; then
     -not \( \
       -path './_*'     -o \
       -path './.git*'   -o \
-      \( -path '*/third_party/*' \) \
+      -path '*/vendor/*' -o \
+      -path '*/third_party/*' \
     \))
 fi
 

hack/update-all.sh

@@ -19,8 +19,10 @@ set -o errexit -o nounset -o pipefail
 ROOT="$(git rev-parse --show-toplevel)"
 cd "${ROOT}"
 
+export LC_ALL=C # for sorting to be consistent across locales
+
 # shellcheck disable=2044 # for-loop over find output is intentional
-for F in $(find ./hack/update -name '*.sh'); do
+for F in $(find ./hack/update -name '*.sh' | sort); do
   echo "Running ${F}"
   "${F}" "$@"
 done

hack/verify/go-mod-tidy.sh → hack/update/go-modules.sh

@@ -19,4 +19,5 @@ set -o errexit -o nounset -o pipefail
 ROOT="$(git rev-parse --show-toplevel)"
 cd "${ROOT}"
 
-./hack/third_party/kubernetes/verify-generated.sh go-mod-tidy "$@"
+go mod vendor
+go mod tidy

hack/update/gofmt.sh

@@ -20,15 +20,21 @@ ROOT="$(git rev-parse --show-toplevel)"
 cd "${ROOT}"
 
 # Find all top-level directories containing Go files, and run gofmt on them.
-# shellcheck disable=SC2207 # read array
+# shellcheck disable=SC2207 # reading array
 dirs=(
-    $(git ls-files -cmo --exclude-standard ':(glob)**/*.go' \
-        `# Omit LICENSES/, which can contain bundled source code. ` \
-        | grep -v '^LICENSES' \
-        | cut -f1 -d/ \
+    $(git ls-files \
+        -cmo \
+        --exclude-standard \
+        -- \
+        ':(glob)**/*.go' \
+        ':!:vendor/*' \
+        ':!:**/vendor/*' \
+        ':!:LICENSES/*' \
+        | while read -r FILE; do dirname "${FILE}"; done \
+        | sort \
         | uniq)
 )
 
 for dir in "${dirs[@]}"; do
-    gofmt -s -w "${dir}"
+  gofmt -s -w "${dir}"
 done

hack/update/licenses.sh

@@ -48,9 +48,15 @@ for target in "${targets[@]}"; do
   tmp_out="$(mktemp -d -t "update-licenses-out.XXXXXX")"
 
   GOOS="${target_os}" \
-    GOARCH="${target_arch}" \
-    CGO_ENABLED=1 \
-    "${GO_LICENSES_BIN}" save ./... --force --save_path="${tmp_out}" > "${tmpfile}" 2>&1 || {
+  GOARCH="${target_arch}" \
+  GOROOT=$(go env GOROOT) \
+  CGO_ENABLED=1 \
+  "${GO_LICENSES_BIN}" save ./... \
+      --include_tests \
+      --force \
+      --ignore=./vendor \
+      --save_path="${tmp_out}" > "${tmpfile}" 2>&1 || \
+  {
     echo "Failed for ${target_os}/${target_arch}:" >&2
     cat "${tmpfile}"
     rm -rf "${tmp_out}"

hack/util/verify-boilerplate.py

@@ -114,6 +114,10 @@ def main():
         if "third_party" in filepath:
             continue
 
+        # exclude vendor directories
+        if "vendor" in filepath:
+            continue
+
         # exclude top-level LICENSES directory
         if filepath.startswith("LICENSES/"):
             continue

hack/verify-all.sh

@@ -19,8 +19,10 @@ set -o errexit -o nounset -o pipefail
 ROOT="$(git rev-parse --show-toplevel)"
 cd "${ROOT}"
 
+export LC_ALL=C # for sorting to be consistent across locales
+
 # shellcheck disable=2044 # for-loop over find output is intentional
-for F in $(find ./hack/verify -name '*.sh'); do
+for F in $(find ./hack/verify -name '*.sh' | sort); do
   echo "Running ${F}"
   "${F}" "$@"
 done

hack/update/go-mod-tidy.sh → hack/verify/go-modules.sh

@@ -19,11 +19,4 @@ set -o errexit -o nounset -o pipefail
 ROOT="$(git rev-parse --show-toplevel)"
 cd "${ROOT}"
 
-go mod tidy
-
-# Tidy all isolated tool modules under hack/tools/
-for D in "${ROOT}/hack/tools"/*; do
-  if [ -d "${D}" ] && [ -f "${D}/go.mod" ]; then
-    (cd "${D}" && go mod tidy)
-  fi
-done
+./hack/third_party/kubernetes/verify-generated.sh go-modules "$@" 

hack/verify/golangci-lint.sh

@@ -27,4 +27,4 @@ cd "${ROOT}"
 # macOS and golangci-lint's typecheck fail-stop suppresses all other
 # findings in the affected files.
 BIN="$("${ROOT}"/hack/run-tool.sh --print-bin-path golangci-lint)"
-exec env GOOS=linux "${BIN}" run ./...
+exec env GOOS=linux "${BIN}" run ./... | { grep -v '^0 issues.$' || true; }

vendor/cel.dev/expr/.bazelversion

@@ -0,0 +1,2 @@
+7.3.2
+# Keep this pinned version in parity with cel-go

vendor/cel.dev/expr/.gitattributes

@@ -0,0 +1,2 @@
+*.pb.go linguist-generated=true
+*.pb.go -diff -merge

vendor/cel.dev/expr/.gitignore

@@ -0,0 +1,2 @@
+bazel-*
+MODULE.bazel.lock

vendor/cel.dev/expr/BUILD.bazel

@@ -0,0 +1,33 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+go_library(
+    name = "expr",
+    srcs = [
+        "checked.pb.go",
+        "eval.pb.go",
+        "explain.pb.go",
+        "syntax.pb.go",
+        "value.pb.go",
+    ],
+    importpath = "cel.dev/expr",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@org_golang_google_protobuf//reflect/protoreflect",
+        "@org_golang_google_protobuf//runtime/protoimpl",
+        "@org_golang_google_protobuf//types/known/anypb",
+        "@org_golang_google_protobuf//types/known/durationpb",
+        "@org_golang_google_protobuf//types/known/emptypb",
+        "@org_golang_google_protobuf//types/known/structpb",
+        "@org_golang_google_protobuf//types/known/timestamppb",
+    ],
+)
+
+alias(
+    name = "go_default_library",
+    actual = ":expr",
+    visibility = ["//visibility:public"],
+)

vendor/cel.dev/expr/CODE_OF_CONDUCT.md

@@ -0,0 +1,25 @@
+# Contributor Code of Conduct
+## Version 0.1.1 (adapted from 0.3b-angular)
+
+As contributors and maintainers of the Common Expression Language
+(CEL) project, we pledge to respect everyone who contributes by
+posting issues, updating documentation, submitting pull requests,
+providing feedback in comments, and any other activities.
+
+Communication through any of CEL's channels (GitHub, Gitter, IRC,
+mailing lists, Google+, Twitter, etc.) must be constructive and never
+resort to personal attacks, trolling, public or private harassment,
+insults, or other unprofessional conduct.
+
+We promise to extend courtesy and respect to everyone involved in this
+project regardless of gender, gender identity, sexual orientation,
+disability, age, race, ethnicity, religion, or level of experience. We
+expect anyone contributing to the project to do the same.
+
+If any member of the community violates this code of conduct, the
+maintainers of the CEL project may take action, removing issues,
+comments, and PRs or blocking accounts as deemed appropriate.
+
+If you are subject to or witness unacceptable behavior, or have any
+other concerns, please email us at
+[cel-conduct@google.com](mailto:cel-conduct@google.com).