mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-13 19:28:55 +00:00
Code Activity

Remove var check (#8990) (#9024)

Browse source 
* fix excessive logs



* remove variable check



---------

Signed-off-by: Jim Bugwadia <jim@nirmata.com>
Co-authored-by: Jim Bugwadia <jim@nirmata.com>
This commit is contained in:
gcp-cherry-pick-bot[bot] 2023-11-27 10:37:36 +00:00 • committed by GitHub
parent a08cb71deb
commit 6883e7c031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/cli/kubectl-kyverno/commands/apply/command.go
View file

@ -244,18 +244,6 @@ func (c *ApplyCommandConfig) applyPolicytoResource(
}
continue
}
matches, err := policy.ExtractVariables(pol)
if err != nil {
log.Log.Error(err, "skipping invalid policy", "name", pol.GetName())
continue
}
if !vars.HasVariables() && variables.NeedsVariables(matches...) {
// check policy in variable file
if !vars.HasPolicyVariables(pol.GetName()) {
fmt.Fprintf(out, "test skipped for policy %v (as required variables are not provided by the users) \n \n", pol.GetName())
continue
}
}
validPolicies = append(validPolicies, pol)
}
var rc processor.ResultCounts

12
cmd/cli/kubectl-kyverno/commands/test/test.go
View file

@ -120,18 +120,6 @@ func runTest(out io.Writer, testCase test.TestCase, auditWarn bool) ([]engineapi
log.Log.Error(err, "skipping invalid policy", "name", pol.GetName())
continue
}
matches, err := policy.ExtractVariables(pol)
if err != nil {
log.Log.Error(err, "skipping invalid policy", "name", pol.GetName())
continue
}
if !vars.HasVariables() && variables.NeedsVariables(matches...) {
// check policy in variable file
if !vars.HasPolicyVariables(pol.GetName()) {
fmt.Fprintln(out, " test skipped for policy", pol.GetName(), "(as required variables are not provided by the users)")
// continue
}
}
validPolicies = append(validPolicies, pol)
}
// execute engine

2
cmd/cli/kubectl-kyverno/variables/new.go
View file

@ -14,7 +14,7 @@ func New(fs billy.Filesystem, resourcePath string, path string, vals *v1alpha1.V
if vals == nil && path != "" {
v, err := values.Load(fs, filepath.Join(resourcePath, path))
if err != nil {
return nil, fmt.Errorf("Unable to load variable file: %s (%w)", path, err)
return nil, fmt.Errorf("unable to load variable file: %s (%w)", path, err)
}
vals = &v.ValuesSpec
}

22
cmd/cli/kubectl-kyverno/variables/utils.go
View file

@ -1,22 +0,0 @@
package variables
import (
"strings"
)
func NeedsVariable(variable string) bool {
return variable != "" &&
!strings.Contains(variable, "request.object") &&
!strings.Contains(variable, "request.operation") &&
!strings.Contains(variable, "element") &&
variable != "elementIndex"
}
func NeedsVariables(variables ...string) bool {
for _, variable := range variables {
if NeedsVariable(variable) {
return true
}
}
return false
}

79
cmd/cli/kubectl-kyverno/variables/utils_test.go
View file

@ -1,79 +0,0 @@
package variables
import (
"testing"
)
func TestNeedsVariable(t *testing.T) {
tests := []struct {
name string
want bool
}{{
name: "",
want: false,
}, {
name: "request.object.spec",
want: false,
}, {
name: "request.operation",
want: false,
}, {
name: "element.spec.container",
want: false,
}, {
name: "elementIndex",
want: false,
}, {
name: "foo",
want: true,
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := NeedsVariable(tt.name); got != tt.want {
t.Errorf("NeedsVariable() = %v, want %v", got, tt.want)
}
})
}
}
func TestNeedsVariables(t *testing.T) {
tests := []struct {
name string
variables []string
want bool
}{{
name: "nil",
variables: nil,
want: false,
}, {
name: "empty",
variables: []string{},
want: false,
}, {
name: "false",
variables: []string{
"request.object.spec",
"request.operation",
"element.spec.container",
"elementIndex",
},
want: false,
}, {
name: "true",
variables: []string{
"request.object.spec",
"request.operation",
"element.spec.container",
"elementIndex",
"foo",
},
want: true,
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := NeedsVariables(tt.variables...); got != tt.want {
t.Errorf("NeedsVariables() = %v, want %v", got, tt.want)
}
})
}
}

16
cmd/cli/kubectl-kyverno/variables/variables.go
View file

@ -13,22 +13,6 @@ type Variables struct {
variables map[string]string
}
func (v Variables) HasVariables() bool {
return len(v.variables) != 0
}
func (v Variables) HasPolicyVariables(policy string) bool {
if v.values == nil {
return false
}
for _, pol := range v.values.Policies {
if pol.Name == policy {
return true
}
}
return false
}
func (v Variables) Subresources() []v1alpha1.Subresource {
if v.values == nil {
return nil

96
cmd/cli/kubectl-kyverno/variables/variables_test.go
View file

@ -10,43 +10,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
)
func TestVariables_HasVariables(t *testing.T) {
tests := []struct {
name string
values *v1alpha1.ValuesSpec
variables map[string]string
want bool
}{{
name: "nil",
values: nil,
variables: nil,
want: false,
}, {
name: "empty",
values: nil,
variables: map[string]string{},
want: false,
}, {
name: "not empty",
values: nil,
variables: map[string]string{
"foo": "bar",
},
want: true,
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
v := Variables{
values: tt.values,
variables: tt.variables,
}
if got := v.HasVariables(); got != tt.want {
t.Errorf("Variables.HasVariables() = %v, want %v", got, tt.want)
}
})
}
}
func TestVariables_Subresources(t *testing.T) {
tests := []struct {
name string
@ -177,65 +140,6 @@ func TestVariables_SetInStore(t *testing.T) {
}
}
func TestVariables_HasPolicyVariables(t *testing.T) {
vals, err := values.Load(nil, "../_testdata/values/limit-configmap-for-sa.yaml")
assert.NoError(t, err)
vals.ValuesSpec.Policies = append(vals.ValuesSpec.Policies, v1alpha1.Policy{
Name: "limit-configmap-for-sa",
Rules: []v1alpha1.Rule{{
Name: "rule",
Values: map[string]interface{}{
"foo": "bar",
},
ForeachValues: map[string][]interface{}{
"baz": nil,
},
}},
})
tests := []struct {
name string
values *v1alpha1.ValuesSpec
variables map[string]string
policy string
want bool
}{{
name: "nil",
values: nil,
variables: nil,
policy: "test",
want: false,
}, {
name: "empty",
values: &v1alpha1.ValuesSpec{},
variables: nil,
policy: "test",
want: false,
}, {
name: "values - test",
values: &vals.ValuesSpec,
variables: nil,
policy: "test",
want: false,
}, {
name: "values - limit-configmap-for-sa",
values: &vals.ValuesSpec,
variables: nil,
policy: "limit-configmap-for-sa",
want: true,
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
v := Variables{
values: tt.values,
variables: tt.variables,
}
if got := v.HasPolicyVariables(tt.policy); got != tt.want {
t.Errorf("Variables.HasPolicyVariables() = %v, want %v", got, tt.want)
}
})
}
}
func TestVariables_ComputeVariables(t *testing.T) {
loadValues := func(path string) *v1alpha1.ValuesSpec {
t.Helper()