mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

SanitizedError fix

Browse source
This commit is contained in:
NoSkillGirl 2020-11-18 15:02:14 +05:30
parent 5794889752
commit 9a9cd55b7b
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
go.sum
View file

@ -939,6 +939,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20u
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

24
pkg/kyverno/apply/command.go
View file

@ -18,7 +18,7 @@ import (
"github.com/kyverno/kyverno/pkg/engine/context" "github.com/kyverno/kyverno/pkg/engine/context"
"github.com/kyverno/kyverno/pkg/engine/response" "github.com/kyverno/kyverno/pkg/engine/response"
"github.com/kyverno/kyverno/pkg/kyverno/common" "github.com/kyverno/kyverno/pkg/kyverno/common"
sanitizederror "github.com/kyverno/kyverno/pkg/kyverno/sanitizedError" sanitizedError "github.com/kyverno/kyverno/pkg/kyverno/sanitizedError"
"github.com/kyverno/kyverno/pkg/openapi" "github.com/kyverno/kyverno/pkg/openapi"
policy2 "github.com/kyverno/kyverno/pkg/policy" policy2 "github.com/kyverno/kyverno/pkg/policy"
"github.com/kyverno/kyverno/pkg/utils" "github.com/kyverno/kyverno/pkg/utils"
@ -68,7 +68,7 @@ func Command() *cobra.Command {
RunE: func(cmd *cobra.Command, policyPaths []string) (err error) { RunE: func(cmd *cobra.Command, policyPaths []string) (err error) {
defer func() { defer func() {
if err != nil { if err != nil {
if !sanitizederror.IsErrorSanitized(err) { if !sanitizedError.IsErrorSanitized(err) {
log.Log.Error(err, "failed to sanitize") log.Log.Error(err, "failed to sanitize")
err = fmt.Errorf("internal error") err = fmt.Errorf("internal error")
} }
@ -76,7 +76,7 @@ func Command() *cobra.Command {
}() }()
if valuesFile != "" && variablesString != "" { if valuesFile != "" && variablesString != "" {
return sanitizederror.NewWithError("pass the values either using set flag or values_file flag", err) return sanitizedError.NewWithError("pass the values either using set flag or values_file flag", err)
} }
variables, valuesMap, err := getVariable(variablesString, valuesFile) variables, valuesMap, err := getVariable(variablesString, valuesFile)
@ -89,7 +89,7 @@ func Command() *cobra.Command {
openAPIController, err := openapi.NewOpenAPIController() openAPIController, err := openapi.NewOpenAPIController()
if err != nil { if err != nil {
return sanitizederror.NewWithError("failed to initialize openAPIController", err) return sanitizedError.NewWithError("failed to initialize openAPIController", err)
} }
var dClient *client.Client var dClient *client.Client
@ -192,7 +192,7 @@ func Command() *cobra.Command {
ers, validateErs, err := applyPolicyOnResource(policy, resource, mutateLogPath, mutateLogPathIsDir, thisPolicyResourceValues, rc, policyReport) ers, validateErs, err := applyPolicyOnResource(policy, resource, mutateLogPath, mutateLogPathIsDir, thisPolicyResourceValues, rc, policyReport)
if err != nil { if err != nil {
return sanitizederror.NewWithError(fmt.Errorf("failed to apply policy %v on resource %v", policy.Name, resource.GetName()).Error(), err) return sanitizedError.NewWithError(fmt.Errorf("failed to apply policy %v on resource %v", policy.Name, resource.GetName()).Error(), err)
} }
engineResponses = append(engineResponses, ers...) engineResponses = append(engineResponses, ers...)
validateEngineResponses = append(validateEngineResponses, validateErs) validateEngineResponses = append(validateEngineResponses, validateErs)
@ -446,8 +446,8 @@ func mutatePolices(policies []*v1.ClusterPolicy) ([]*v1.ClusterPolicy, error) {
for _, policy := range policies { for _, policy := range policies {
p, err := common.MutatePolicy(policy, logger) p, err := common.MutatePolicy(policy, logger)
if err != nil { if err != nil {
if !sanitizederror.IsErrorSanitized(err) { if !sanitizedError.IsErrorSanitized(err) {
return nil, sanitizederror.NewWithError("failed to mutate policy.", err) return nil, sanitizedError.NewWithError("failed to mutate policy.", err)
} }
return nil, err return nil, err
} }
@ -500,30 +500,30 @@ func createFileOrFolder(mutateLogPath string, mutateLogPathIsDir bool) error {
if os.IsNotExist(err) { if os.IsNotExist(err) {
errDir := os.MkdirAll(folderPath, 0755) errDir := os.MkdirAll(folderPath, 0755)
if errDir != nil { if errDir != nil {
return sanitizederror.NewWithError(fmt.Sprintf("failed to create directory"), err) return sanitizedError.NewWithError(fmt.Sprintf("failed to create directory"), err)
} }
} }
} }
file, err := os.OpenFile(mutateLogPath, os.O_RDONLY|os.O_CREATE, 0644) file, err := os.OpenFile(mutateLogPath, os.O_RDONLY|os.O_CREATE, 0644)
if err != nil { if err != nil {
return sanitizederror.NewWithError(fmt.Sprintf("failed to create file"), err) return sanitizedError.NewWithError(fmt.Sprintf("failed to create file"), err)
} }
err = file.Close() err = file.Close()
if err != nil { if err != nil {
return sanitizederror.NewWithError(fmt.Sprintf("failed to close file"), err) return sanitizedError.NewWithError(fmt.Sprintf("failed to close file"), err)
} }
} else { } else {
errDir := os.MkdirAll(mutateLogPath, 0755) errDir := os.MkdirAll(mutateLogPath, 0755)
if errDir != nil { if errDir != nil {
return sanitizederror.NewWithError(fmt.Sprintf("failed to create directory"), err) return sanitizedError.NewWithError(fmt.Sprintf("failed to create directory"), err)
} }
} }
} else { } else {
return sanitizederror.NewWithError(fmt.Sprintf("failed to describe file"), err) return sanitizedError.NewWithError(fmt.Sprintf("failed to describe file"), err)
} }
} }