github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hack/verify-staging-imports.sh: simplify by negating package list

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-06-01 14:49:13 +02:00
parent 7043372d05
commit 2b26a946a2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hack/verify-staging-imports.sh
View File

@@ -37,7 +37,8 @@ function print_forbidden_imports () {
go list -f $'{{with $package := .ImportPath}}{{range $.Imports}}{{$package}} imports {{.}}\n{{end}}{{end}}' ./vendor/k8s.io/${PACKAGE}/... | go list -f $'{{with $package := .ImportPath}}{{range $.Imports}}{{$package}} imports {{.}}\n{{end}}{{end}}' ./vendor/k8s.io/${PACKAGE}/... |
sed 's|^k8s.io/kubernetes/vendor/||;s| k8s.io/kubernetes/vendor/| |' | sed 's|^k8s.io/kubernetes/vendor/||;s| k8s.io/kubernetes/vendor/| |' |
grep -v " k8s.io/${PACKAGE}" | grep -v " k8s.io/${PACKAGE}" |
grep -e "imports \(${RE}\)" grep " k8s.io/" |
grep -v -e "imports \(${RE}\)"
) )
if [ -n "${FORBIDDEN}" ]; then if [ -n "${FORBIDDEN}" ]; then
echo "${PACKAGE} has a forbidden dependency:" echo "${PACKAGE} has a forbidden dependency:"
@@ -50,7 +51,8 @@ function print_forbidden_imports () {
go list -f $'{{with $package := .ImportPath}}{{range $.TestImports}}{{$package}} imports {{.}}\n{{end}}{{end}}' ./vendor/k8s.io/${PACKAGE}/... | go list -f $'{{with $package := .ImportPath}}{{range $.TestImports}}{{$package}} imports {{.}}\n{{end}}{{end}}' ./vendor/k8s.io/${PACKAGE}/... |
sed 's|^k8s.io/kubernetes/vendor/||;s| k8s.io/kubernetes/vendor/| |' | sed 's|^k8s.io/kubernetes/vendor/||;s| k8s.io/kubernetes/vendor/| |' |
grep -v " k8s.io/${PACKAGE}" | grep -v " k8s.io/${PACKAGE}" |
grep -e "imports \(${RE}\)" grep " k8s.io/" |
grep -v -e "imports \(${RE}\)"
) )
if [ -n "${TEST_FORBIDDEN}" ]; then if [ -n "${TEST_FORBIDDEN}" ]; then
echo "${PACKAGE} has a forbidden dependency in test code:" echo "${PACKAGE} has a forbidden dependency in test code:"
@@ -63,11 +65,11 @@ function print_forbidden_imports () {
} }
RC=0 RC=0
print_forbidden_imports apimachinery k8s.io/ || RC=1 print_forbidden_imports apimachinery || RC=1
print_forbidden_imports apiserver k8s.io/kubernetes k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1 print_forbidden_imports client-go k8s.io/apimachinery || RC=1
print_forbidden_imports client-go k8s.io/kubernetes k8s.io/apiserver k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1 print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go || RC=1
print_forbidden_imports kube-aggregator k8s.io/kubernetes k8s.io/sample-apiserver || RC=1 print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports sample-apiserver k8s.io/kubernetes k8s.io/kube-aggregator || RC=1 print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
if [ ${RC} != 0 ]; then if [ ${RC} != 0 ]; then
exit ${RC} exit ${RC}
fi fi
@@ -85,4 +87,4 @@ for EXAMPLE in vendor/k8s.io/client-go/examples/{in-cluster,out-of-cluster,third
fi fi
done done
exit 0 exit 0