github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105171 from liggitt/gomodule-staticcheck

Browse Source 
Make staticcheck package-compatible
This commit is contained in:
Kubernetes Prow Robot 2021-09-21 10:34:23 -07:00 committed by GitHub
commit 40c9203472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hack/verify-staticcheck.sh
View File

@ -45,6 +45,7 @@ export IFS=','; checks="${CHECKS[*]}"; unset IFS
# NOTE: To ignore issues detected a package, add it to the .staticcheck_failures blacklist # NOTE: To ignore issues detected a package, add it to the .staticcheck_failures blacklist
IGNORE=( IGNORE=(
"vendor/k8s.io/kubectl/pkg/cmd/edit/testdata" # golang/go#24854, dominikh/go-tools#565 "vendor/k8s.io/kubectl/pkg/cmd/edit/testdata" # golang/go#24854, dominikh/go-tools#565
"cluster/addons/fluentd-elasticsearch/es-image" # cannot traverse go modules
) )
export IFS='|'; ignore_pattern="^(${IGNORE[*]})\$"; unset IFS export IFS='|'; ignore_pattern="^(${IGNORE[*]})\$"; unset IFS
@ -63,10 +64,21 @@ cd "${KUBE_ROOT}"
failure_file="${KUBE_ROOT}/hack/.staticcheck_failures" failure_file="${KUBE_ROOT}/hack/.staticcheck_failures"
kube::util::check-file-in-alphabetical-order "${failure_file}" kube::util::check-file-in-alphabetical-order "${failure_file}"
function normalize_package() {
pkg="${1}"
if [[ "${pkg}" == "vendor/"* || "${pkg}" == "k8s.io/"* ]]; then
# Treat this as a full package path (stripping vendor prefix if needed)
echo "${pkg#"vendor/"}"
else
# Treat this as a relative package path to k8s.io/kubernetes
echo "./${pkg}"
fi
}
all_packages=() all_packages=()
while IFS='' read -r line; do while IFS='' read -r line; do
# Prepend './' to get staticcheck to treat these as paths, not packages. line=$(normalize_package "${line}")
all_packages+=("./$line") all_packages+=("${line}")
done < <( hack/make-rules/helpers/cache_go_dirs.sh "${KUBE_ROOT}/_tmp/all_go_dirs" | done < <( hack/make-rules/helpers/cache_go_dirs.sh "${KUBE_ROOT}/_tmp/all_go_dirs" |
grep "^${FOCUS:-.}" | grep "^${FOCUS:-.}" |
grep -vE "(third_party|generated|clientset_generated|hack|testdata|/_)" | grep -vE "(third_party|generated|clientset_generated|hack|testdata|/_)" |
@ -95,7 +107,7 @@ while read -r error; do
elif [[ "${in_failing}" -eq "0" ]]; then elif [[ "${in_failing}" -eq "0" ]]; then
really_failing+=( "$pkg" ) really_failing+=( "$pkg" )
fi fi
done < <(GOOS=linux staticcheck -checks "${checks}" "${all_packages[@]}" 2>/dev/null || true) done < <(GO111MODULE=on GOOS=linux staticcheck -checks "${checks}" "${all_packages[@]}" 2>/dev/null || true)
export IFS=$'\n' # Expand ${really_failing[*]} to separate lines export IFS=$'\n' # Expand ${really_failing[*]} to separate lines
kube::util::read-array really_failing < <(sort -u <<<"${really_failing[*]}") kube::util::read-array really_failing < <(sort -u <<<"${really_failing[*]}")
@ -109,8 +121,9 @@ done
# Check that all failing_packages actually still exist # Check that all failing_packages actually still exist
gone=() gone=()
for p in "${failing_packages[@]}"; do for p in "${failing_packages[@]}"; do
if ! kube::util::array_contains "./$p" "${all_packages[@]}"; then p=$(normalize_package "${p}")
gone+=( "$p" ) if ! kube::util::array_contains "${p}" "${all_packages[@]}"; then
gone+=( "${p}" )
fi fi
done done

1
test/images/agnhost/inclusterclient/main.go
View File

@ -73,7 +73,6 @@ func main(cmd *cobra.Command, args []string) {
c := kubernetes.NewForConfigOrDie(cfg).RESTClient() c := kubernetes.NewForConfigOrDie(cfg).RESTClient()
//lint:ignore SA1015 noisy positive, `time.Tick` is used in a main function which is fine
t := time.Tick(time.Duration(pollInterval) * time.Second) t := time.Tick(time.Duration(pollInterval) * time.Second)
for { for {
<-t <-t