Merge pull request #54558 from sttts/sttts-fix-zero-case-import-verifier

Automatic merge from submit-queue (batch tested with PRs 54537, 54558). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. importverifier: fix isPathUnder for base == path isPathUnder returned false for base == path, but should return true.

Merge pull request #54558 from sttts/sttts-fix-zero-case-import-verifier
94acd5a0 · Kubernetes Submit Queue · GitHub · d8736073 · acbe87d6 · 94acd5a0
Commit 94acd5a0 authored Oct 25, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

importverifier.go cmd/importverifier/importverifier.go +1 -1

No files found.
--- a/cmd/importverifier/importverifier.go
+++ b/cmd/importverifier/importverifier.go
@@ -110,7 +110,7 @@ func isPathUnder(base, path string) (bool, error) {

 	// if path is below base, the relative path
 	// from base to path will not start with `../`
-	return !strings.HasPrefix(relPath, "."), nil
+	return !strings.HasPrefix(relPath, ".."), nil
 }

 // forbiddenImportsFor determines all of the forbidden