diff --git a/go.mod b/go.mod index 61b6a637..f263389c 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.8 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 - knative.dev/pkg v0.0.0-20201002052829-735a38c03260 - knative.dev/test-infra v0.0.0-20201001200229-a6988e3b3b38 + knative.dev/pkg v0.0.0-20201003175733-ea7374e81105 + knative.dev/test-infra v0.0.0-20201002164834-8c07ff018549 ) replace ( diff --git a/go.sum b/go.sum index d5e7f955..85786bdf 100644 --- a/go.sum +++ b/go.sum @@ -1894,8 +1894,8 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8= -knative.dev/pkg v0.0.0-20201002052829-735a38c03260 h1:/L7Iahq+SDXw2HbKAIUfduj/eXIlQxwSbghizLqDKaI= -knative.dev/pkg v0.0.0-20201002052829-735a38c03260/go.mod h1:o9w/M7OnPc0ou07PIUORHUBSZgszeZebAYZkxQ8GdFw= +knative.dev/pkg v0.0.0-20201003175733-ea7374e81105 h1:dx4o9pDAyyYAqpDiCQiIVbcBMjVYGAV+lzgJbVijZtg= +knative.dev/pkg v0.0.0-20201003175733-ea7374e81105/go.mod h1:o9w/M7OnPc0ou07PIUORHUBSZgszeZebAYZkxQ8GdFw= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= @@ -1903,6 +1903,8 @@ knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT knative.dev/test-infra v0.0.0-20200707183444-aed09e56ddc7/go.mod h1:RjYAhXnZqeHw9+B0zsbqSPlae0lCvjekO/nw5ZMpLCs= knative.dev/test-infra v0.0.0-20201001200229-a6988e3b3b38 h1:g2LdlRp7jB6QHz3D69fnvn2OfX5C6bydIzubyLpFNl0= knative.dev/test-infra v0.0.0-20201001200229-a6988e3b3b38/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= +knative.dev/test-infra v0.0.0-20201002164834-8c07ff018549 h1:8UObRJ0lnWvU9FuD8ubmkwJo14+aZtboq1ncBWbs2uI= +knative.dev/test-infra v0.0.0-20201002164834-8c07ff018549/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= diff --git a/vendor/knative.dev/pkg/apis/contexts.go b/vendor/knative.dev/pkg/apis/contexts.go index 4e8b60d6..a8c7683a 100644 --- a/vendor/knative.dev/pkg/apis/contexts.go +++ b/vendor/knative.dev/pkg/apis/contexts.go @@ -134,6 +134,12 @@ func WithinParent(ctx context.Context, om metav1.ObjectMeta) context.Context { return context.WithValue(ctx, parentMetaKey{}, om) } +// IsWithinParent returns true if we're within parent context. +func IsWithinParent(ctx context.Context) bool { + _, ok := ctx.Value(parentMetaKey{}).(metav1.ObjectMeta) + return ok +} + // ParentMeta accesses the ObjectMeta of the enclosing parent resource // from the context. See WithinParent for how to attach the parent's // ObjectMeta to the context. diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index ab9f303f..6f4836b6 100644 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -551,45 +551,6 @@ function check_licenses() { { echo "--- FAIL: go-licenses failed the license check"; return 1; } } -# Run the given linter on the given files, checking it exists first. -# Parameters: $1 - tool -# $2 - tool purpose (for error message if tool not installed) -# $3 - tool parameters (quote if multiple parameters used) -# $4..$n - files to run linter on -function run_lint_tool() { - local checker=$1 - local params=$3 - if ! hash ${checker} 2>/dev/null; then - warning "${checker} not installed, not $2" - return 127 - fi - shift 3 - local failed=0 - for file in $@; do - ${checker} ${params} ${file} || failed=1 - done - return ${failed} -} - -# Check links in the given markdown files. -# Parameters: $1...$n - files to inspect -function check_links_in_markdown() { - # https://github.com/raviqqe/liche - local config="${REPO_ROOT_DIR}/test/markdown-link-check-config.rc" - [[ ! -e ${config} ]] && config="${_TEST_INFRA_SCRIPTS_DIR}/markdown-link-check-config.rc" - local options="$(grep '^-' ${config} | tr \"\n\" ' ')" - run_lint_tool liche "checking links in markdown files" "-d ${REPO_ROOT_DIR} ${options}" $@ -} - -# Check format of the given markdown files. -# Parameters: $1..$n - files to inspect -function lint_markdown() { - # https://github.com/markdownlint/markdownlint - local config="${REPO_ROOT_DIR}/test/markdown-lint-config.rc" - [[ ! -e ${config} ]] && config="${_TEST_INFRA_SCRIPTS_DIR}/markdown-lint-config.rc" - run_lint_tool mdl "linting markdown files" "-c ${config}" $@ -} - # Return whether the given parameter is an integer. # Parameters: $1 - integer to check function is_int() { diff --git a/vendor/knative.dev/test-infra/scripts/markdown-link-check-config.rc b/vendor/knative.dev/test-infra/scripts/markdown-link-check-config.rc deleted file mode 100644 index 49b042e8..00000000 --- a/vendor/knative.dev/test-infra/scripts/markdown-link-check-config.rc +++ /dev/null @@ -1,5 +0,0 @@ -# For help, see -# https://github.com/raviqqe/liche/blob/master/README.md - -# Don't check localhost links and don't check templated links --x "(^https?://localhost($|[:/].*))|(^https://.*{{.*$)" diff --git a/vendor/knative.dev/test-infra/scripts/markdown-lint-config.rc b/vendor/knative.dev/test-infra/scripts/markdown-lint-config.rc deleted file mode 100644 index 461f891a..00000000 --- a/vendor/knative.dev/test-infra/scripts/markdown-lint-config.rc +++ /dev/null @@ -1,5 +0,0 @@ -# For help, see -# https://github.com/markdownlint/markdownlint/blob/master/docs/configuration.md - -# Ignore long lines -rules "~MD013" diff --git a/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh b/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh index a1ee7cb4..e873736b 100644 --- a/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh @@ -20,8 +20,6 @@ source $(dirname "${BASH_SOURCE[0]}")/library.sh # Custom configuration of presubmit tests -readonly DISABLE_MD_LINTING=${DISABLE_MD_LINTING:-0} -readonly DISABLE_MD_LINK_CHECK=${DISABLE_MD_LINK_CHECK:-0} readonly PRESUBMIT_TEST_FAIL_FAST=${PRESUBMIT_TEST_FAIL_FAST:-0} # Extensions or file patterns that don't require presubmit tests. @@ -119,36 +117,12 @@ function report_build_test() { [[ -z "${errors}" ]] } -# Perform markdown build tests if necessary, unless disabled. -function markdown_build_tests() { - (( DISABLE_MD_LINTING && DISABLE_MD_LINK_CHECK )) && return 0 - # Get changed markdown files (ignore /vendor, github templates, and deleted files) - local mdfiles="" - for file in $(echo "${CHANGED_FILES}" | grep \\.md$ | grep -v ^vendor/ | grep -v ^.github/); do - [[ -f "${file}" ]] && mdfiles="${mdfiles} ${file}" - done - [[ -z "${mdfiles}" ]] && return 0 - local failed=0 - if (( ! DISABLE_MD_LINTING )); then - subheader "Linting the markdown files" - report_build_test Markdown_Lint lint_markdown "${mdfiles}" || failed=1 - fi - if (( ! DISABLE_MD_LINK_CHECK )); then - subheader "Checking links in the markdown files" - report_build_test Markdown_Link check_links_in_markdown "${mdfiles}" || failed=1 - fi - return ${failed} -} - # Default build test runner that: -# * check markdown files # * run `/hack/verify-codegen.sh` (if it exists) # * `go build` on the entire repo # * check licenses in all go packages function default_build_test_runner() { local failed=0 - # Perform markdown build checks - markdown_build_tests || failed=1 # Run verify-codegen check if [[ -f ./hack/verify-codegen.sh ]]; then subheader "Checking autogenerated code is up-to-date" diff --git a/vendor/modules.txt b/vendor/modules.txt index 7336c54b..0a1f61d9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -725,7 +725,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/pkg v0.0.0-20201002052829-735a38c03260 +# knative.dev/pkg v0.0.0-20201003175733-ea7374e81105 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck/ducktypes @@ -749,7 +749,7 @@ knative.dev/pkg/metrics/metricskey knative.dev/pkg/network knative.dev/pkg/reconciler knative.dev/pkg/system -# knative.dev/test-infra v0.0.0-20201001200229-a6988e3b3b38 +# knative.dev/test-infra v0.0.0-20201002164834-8c07ff018549 ## explicit knative.dev/test-infra/scripts knative.dev/test-infra/tools/dep-collector