mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
Neutralize obsolete verify scripts
This is all obsolete or covered by verify-codegen now.
This commit is contained in:
Tim Hockin
parent
70c1c795e8
commit
e477d45f56
@ -37,13 +37,6 @@ EXCLUDED_PATTERNS=(
|
||||
"verify-licenses.sh" # runs in a separate job to monitor availability of the dependencies periodically
|
||||
)
|
||||
|
||||
# Exclude generated-files-remake in certain cases, if they're running in a separate job.
|
||||
if [[ ${EXCLUDE_FILES_REMAKE:-} =~ ^[yY]$ ]]; then
|
||||
EXCLUDED_PATTERNS+=(
|
||||
"verify-generated-files-remake.sh" # run in a separate job
|
||||
)
|
||||
fi
|
||||
|
||||
# Exclude typecheck in certain cases, if they're running in a separate job.
|
||||
if [[ ${EXCLUDE_TYPECHECK:-} =~ ^[yY]$ ]]; then
|
||||
EXCLUDED_PATTERNS+=(
|
||||
|
||||
@ -14,406 +14,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This script verifies that the expected results are obtained when creating each
|
||||
# type of file(e.g. codegen tool itself, a file in a package that needs codegen,
|
||||
# and etc.) for verification and then generating the code(executes
|
||||
# `make generated_files`).
|
||||
# Usage: `hack/verify-generated-files-remake.sh`.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
kube::util::ensure_clean_working_dir
|
||||
|
||||
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
|
||||
_tmp_gopath="${_tmpdir}/go"
|
||||
_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes"
|
||||
mkdir -p "${_tmp_kuberoot}/.."
|
||||
git worktree add "${_tmp_kuberoot}" HEAD
|
||||
kube::util::trap_add "git worktree remove -f ${_tmp_kuberoot} && rm -rf ${_tmpdir}" EXIT
|
||||
cd "${_tmp_kuberoot}"
|
||||
|
||||
# clean out anything from the temp dir that's not checked in
|
||||
git clean -ffxd
|
||||
|
||||
# $1 = filename pattern as in "zz_generated.$1.go"
|
||||
function find_genfiles() {
|
||||
find . \
|
||||
\( \
|
||||
-not \( \
|
||||
\( \
|
||||
-path ./_\* -o \
|
||||
-path ./.\* \
|
||||
\) -prune \
|
||||
\) \
|
||||
\) -name "zz_generated.$1.go"
|
||||
}
|
||||
|
||||
# $1 = filename pattern as in "zz_generated.$1.go"
|
||||
# $2 timestamp file
|
||||
function newer() {
|
||||
find_genfiles "$1" | while read -r F; do
|
||||
if [[ "${F}" -nt "$2" ]]; then
|
||||
echo "${F}"
|
||||
fi
|
||||
done | LC_ALL=C sort
|
||||
}
|
||||
|
||||
# $1 = filename pattern as in "zz_generated.$1.go"
|
||||
# $2 timestamp file
|
||||
function older() {
|
||||
find_genfiles "$1" | while read -r F; do
|
||||
if [[ "$2" -nt "${F}" ]]; then
|
||||
echo "${F}"
|
||||
fi
|
||||
done | LC_ALL=C sort
|
||||
}
|
||||
|
||||
function assert_clean() {
|
||||
make generated_files >/dev/null
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(newer deepcopy "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated files changed on back-to-back 'make' runs:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
return 1
|
||||
fi
|
||||
true
|
||||
}
|
||||
|
||||
STAMP=/tmp/stamp.$RANDOM
|
||||
|
||||
#
|
||||
# Test when we touch a file in a package that needs codegen.
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
DIR=staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1
|
||||
touch "${DIR}/types.go"
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(newer deepcopy "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.deepcopy.go" ]]; then
|
||||
echo "Wrong generated deepcopy files changed after touching src file:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
X="$(newer defaults "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.defaults.go" ]]; then
|
||||
echo "Wrong generated defaults files changed after touching src file:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
X="$(newer conversion "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.conversion.go" ]]; then
|
||||
echo "Wrong generated conversion files changed after touching src file:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when the codegen tool itself changes: deepcopy
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older deepcopy "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated deepcopy files did not change after touching code-generator file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older deepcopy "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated deepcopy files did not change after touching code-generator dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older deepcopy "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated deepcopy files did not change after touching code-generator dep file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older deepcopy "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated deepcopy files did not change after touching code-generator dep dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when the codegen tool itself changes: defaults
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older defaults "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated defaults files did not change after touching code-generator file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older defaults "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated defaults files did not change after touching code-generator dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older defaults "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated defaults files did not change after touching code-generator dep file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older defaults "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated defaults files did not change after touching code-generator dep dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when the codegen tool itself changes: conversion
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older conversion "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated conversion files did not change after touching code-generator file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch staging/src/k8s.io/code-generator/cmd/conversion-gen/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older conversion "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated conversion files did not change after touching code-generator dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older conversion "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated conversion files did not change after touching code-generator dep file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older conversion "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated conversion files did not change after touching code-generator dep dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when we touch a file in a package that needs codegen for all openapi specs.
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch "staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go"
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(newer openapi "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/code-generator/examples/apiserver/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go" ]]; then
|
||||
echo "Wrong generated openapi files changed after touching src file:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when we touch a file in a package that needs codegen for only the main openapi spec.
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch "staging/src/k8s.io/api/apps/v1/types.go"
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(newer openapi "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./pkg/generated/openapi/zz_generated.openapi.go" ]]; then
|
||||
echo "Wrong generated openapi files changed after touching src file:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Test when we touch a file, modify the violation file it should fail, and UPDATE_API_KNOWN_VIOLATIONS=true updates it.
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch "staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go"
|
||||
echo > api/api-rules/violation_exceptions.list
|
||||
echo > api/api-rules/codegen_violation_exceptions.list
|
||||
if make generated_files >/dev/null 2>&1; then
|
||||
echo "Expected make generated_files to fail with API violations."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
touch "${STAMP}"
|
||||
make generated_files UPDATE_API_KNOWN_VIOLATIONS=true >/dev/null
|
||||
X="$(newer openapi "${STAMP}")"
|
||||
if [[ -z "${X}" || ${X} != "./pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/code-generator/examples/apiserver/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/zz_generated.openapi.go
|
||||
./staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go" ]]; then
|
||||
echo "Wrong generated openapi files changed after updating violation files:"
|
||||
echo " ${X:-(none)}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
for f in api/api-rules/violation_exceptions.list api/api-rules/codegen_violation_exceptions.list; do
|
||||
if ! git diff --quiet "$f"; then
|
||||
echo "Violation file \"$f\" was not updated with UPDATE_API_KNOWN_VIOLATIONS=true."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# Test when the codegen tool itself changes: openapi
|
||||
#
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older openapi "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated openapi files did not change after touching code-generator file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older openapi "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated openapi files did not change after touching code-generator dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/kube-openapi/pkg/generators/openapi.go
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older openapi "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated openapi files did not change after touching code-generator dep file:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assert_clean
|
||||
|
||||
touch vendor/k8s.io/kube-openapi/pkg/generators
|
||||
touch "${STAMP}"
|
||||
make generated_files >/dev/null
|
||||
X="$(older openapi "${STAMP}")"
|
||||
if [[ -n "${X}" ]]; then
|
||||
echo "Generated openapi files did not change after touching code-generator dep dir:"
|
||||
echo " ${X}" | tr '\n' ' '
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
# TODO(thockin): remove this file once all tests pass
|
||||
echo "this script is deprecated"
|
||||
|
||||
@ -14,41 +14,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This script checks whether updating of generated code is needed or not. We
|
||||
# should run `make generated_files` if generated code is out of date.
|
||||
# Usage: `hack/verify-generated-files.sh`.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||
export KUBE_ROOT
|
||||
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
kube::util::ensure_clean_working_dir
|
||||
|
||||
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
|
||||
kube::util::trap_add "rm -rf ${_tmpdir}" EXIT
|
||||
|
||||
_tmp_gopath="${_tmpdir}/go"
|
||||
_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes"
|
||||
mkdir -p "${_tmp_kuberoot}/.."
|
||||
cp -a "${KUBE_ROOT}" "${_tmp_kuberoot}/.."
|
||||
|
||||
cd "${_tmp_kuberoot}"
|
||||
|
||||
# clean out anything from the temp dir that's not checked in
|
||||
git clean -ffxd
|
||||
# regenerate any generated code
|
||||
make generated_files
|
||||
|
||||
changed_files=$(git status --porcelain)
|
||||
|
||||
if [[ -n "${changed_files}" ]]; then
|
||||
echo "!!! Generated code is out of date:" >&2
|
||||
echo "${changed_files}" >&2
|
||||
echo >&2
|
||||
echo "Please run make generated_files." >&2
|
||||
exit 1
|
||||
fi
|
||||
# TODO(thockin): remove this file once all tests pass
|
||||
echo "this script is deprecated"
|
||||
|
||||
@ -30,7 +30,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
kube::util::ensure_clean_working_dir
|
||||
|
||||
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
|
||||
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-yamlfmt.XXXXXX)")"
|
||||
|
||||
_tmp_gopath="${_tmpdir}/go"
|
||||
_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user