mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-06 07:57:07 +00:00
Code Activity

#1513 [BUG] CLI Panic when assigning variables

Browse source 
Signed-off-by: vyankatesh_neualto <vyankatesh@neualto.com>
This commit is contained in:
vyankatesh_neualto 2021-02-03 18:24:50 +05:30
parent 18f20abbf9
commit 2f92b95015
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/kyverno/common/common.go
View file

@ -263,7 +263,9 @@ func RemoveDuplicateVariables(matches [][]string) string {
}
// GetVariable - get the variables from console/file
func GetVariable(variablesString, valuesFile string) (variables map[string]string, valuesMap map[string]map[string]Resource, err error) {
func GetVariable(variablesString, valuesFile string) ( map[string]string, map[string]map[string]Resource, error) {
valuesMap := make(map[string]map[string]Resource)
variables := make(map[string]string)
if variablesString != "" {
kvpairs := strings.Split(strings.Trim(variablesString, " "), ",")
for _, kvpair := range kvpairs {
@ -271,7 +273,6 @@ func GetVariable(variablesString, valuesFile string) (variables map[string]strin
variables[strings.Trim(kvs[0], " ")] = strings.Trim(kvs[1], " ")
}
}
if valuesFile != "" {
yamlFile, err := ioutil.ReadFile(valuesFile)
if err != nil {

41
pkg/kyverno/test/command.go
View file

@ -263,23 +263,23 @@ func applyPoliciesFromPath(fs billy.Filesystem, policyBytes []byte, valuesFile s
for _, policy := range mutatedPolicies {
err := policy2.Validate(policy, nil, true, openAPIController)
if err != nil {
fmt.Println("valuesMap1")
log.Log.V(3).Info(fmt.Sprintf("skipping policy %v as it is not valid", policy.Name), "error", err)
continue
}
matches := common.PolicyHasVariables(*policy)
variable := common.RemoveDuplicateVariables(matches)
if len(matches) > 0 && valuesFile == "" {
if len(matches) > 0 && variablesString == "" && values.Variables == "" {
skipPolicy := SkippedPolicy{
Name: policy.GetName(),
Rules: policy.Spec.Rules,
Variable: variable,
Name: policy.GetName(),
Rules: policy.Spec.Rules,
Variable: variable,
}
skippedPolicies = append(skippedPolicies, skipPolicy)
log.Log.V(3).Info(fmt.Sprintf("skipping policy %s", policy.Name), "error", fmt.Sprintf("policy have variable - %s", variable))
continue
}
for _, resource := range resources {
thisPolicyResourceValues := make(map[string]string)
if len(valuesMap[policy.GetName()]) != 0 && !reflect.DeepEqual(valuesMap[policy.GetName()][resource.GetName()], Resource{}) {
thisPolicyResourceValues = valuesMap[policy.GetName()][resource.GetName()].Values
@ -297,9 +297,9 @@ func applyPoliciesFromPath(fs billy.Filesystem, policyBytes []byte, valuesFile s
}
}
resultsMap := buildPolicyResults(validateEngineResponses)
resuleErr := printTestResult(resultsMap, values.Results)
if resuleErr != nil {
return sanitizederror.NewWithError("Unable to genrate result. error:", resuleErr)
resultErr := printTestResult(resultsMap, values.Results)
if resultErr != nil {
return sanitizederror.NewWithError("Unable to genrate result. Error:", resultErr)
os.Exit(1)
}
return
@ -321,25 +321,24 @@ func printTestResult(resps map[string][]interface {}, testResults []TestResults)
if err != nil {
return sanitizederror.NewWithError("failed to convert json", err)
}
var c []ReportResult
json.Unmarshal(valuesBytes, &c)
var r []ReportResult
json.Unmarshal(valuesBytes, &r)
res.Result = boldRed.Sprintf("Fail")
if len(c) != 0 {
var resource1 TestResults
for _, c1 := range c {
if c1.Resources[0].Name == v.Resource {
resource1.Policy = c1.Policy
resource1.Rule = c1.Rule
resource1.Status = c1.Status
resource1.Resource = c1.Resources[0].Name
if v == resource1 {
if len(r) != 0 {
var resource TestResults
for _, testRes := range r {
if testRes.Resources[0].Name == v.Resource {
resource.Policy = testRes.Policy
resource.Rule = testRes.Rule
resource.Status = testRes.Status
resource.Resource = testRes.Resources[0].Name
if v == resource {
res.Result = "Pass"
}
}
}
table = append(table, res)
}
table = append(table, res)
}
printer.BorderTop, printer.BorderBottom, printer.BorderLeft, printer.BorderRight = true, true, true, true
printer.CenterSeparator = "│"