Merge pull request kubernetes#85800 from beautytiger/dev-191202-fixtrim

k8s-ci-robot · web-flow · commit 896b77ed5363 · 2019-12-03T15:47:22.000-08:00
fix: replace TrimLeft with TrimPrefix and TrimRight with TrimSuffix
diff --git a/staging/src/k8s.io/apiserver/pkg/audit/policy/checker.go b/staging/src/k8s.io/apiserver/pkg/audit/policy/checker.go
@@ -185,11 +185,11 @@ func ruleMatchesResource(r *audit.PolicyRule, attrs authorizer.Attributes) bool
 						return true
 					}
 					// match "*/subresource"
-					if len(subresource) > 0 && strings.HasPrefix(res, "*/") && subresource == strings.TrimLeft(res, "*/") {
+					if len(subresource) > 0 && strings.HasPrefix(res, "*/") && subresource == strings.TrimPrefix(res, "*/") {
 						return true
 					}
 					// match "resource/*"
-					if strings.HasSuffix(res, "/*") && resource == strings.TrimRight(res, "/*") {
+					if strings.HasSuffix(res, "/*") && resource == strings.TrimSuffix(res, "/*") {
 						return true
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -185,11 +185,11 @@ func ruleMatchesResource(r *audit.PolicyRule, attrs authorizer.Attributes) bool`
`185`	`185`	`return true`
`186`	`186`	`}`
`187`	`187`	`// match "*/subresource"`
`188`		`- if len(subresource) > 0 && strings.HasPrefix(res, "/") && subresource == strings.TrimLeft(res, "/") {`
	`188`	`+ if len(subresource) > 0 && strings.HasPrefix(res, "/") && subresource == strings.TrimPrefix(res, "/") {`
`189`	`189`	`return true`
`190`	`190`	`}`
`191`	`191`	`// match "resource/*"`
`192`		`- if strings.HasSuffix(res, "/") && resource == strings.TrimRight(res, "/") {`
	`192`	`+ if strings.HasSuffix(res, "/") && resource == strings.TrimSuffix(res, "/") {`
`193`	`193`	`return true`
`194`	`194`	`}`
`195`	`195`	`}`