From d604cc7faffda76502a16e7b95aa7127890cd5f2 Mon Sep 17 00:00:00 2001 From: dwertent Date: Sun, 5 Dec 2021 09:50:56 +0200 Subject: [PATCH] update k8sinterface version --- go.mod | 2 +- go.sum | 3 ++- resourcehandler/fieldselector.go | 4 +++- resourcehandler/fieldselector_test.go | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 resourcehandler/fieldselector_test.go diff --git a/go.mod b/go.mod index 44facbd8..ec6c311b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/armosec/armoapi-go v0.0.23 - github.com/armosec/k8s-interface v0.0.24 + github.com/armosec/k8s-interface v0.0.27 github.com/armosec/opa-utils v0.0.57 github.com/armosec/rbac-utils v0.0.1 github.com/armosec/utils-go v0.0.3 diff --git a/go.sum b/go.sum index b6d7ed9d..83817ce3 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,9 @@ github.com/armosec/armoapi-go v0.0.2/go.mod h1:vIK17yoKbJRQyZXWWLe3AqfqCRITxW8qm github.com/armosec/armoapi-go v0.0.23 h1:jqoLIWM5CR7DCD9fpFgN0ePqtHvOCoZv/XzCwsUluJU= github.com/armosec/armoapi-go v0.0.23/go.mod h1:iaVVGyc23QGGzAdv4n+szGQg3Rbpixn9yQTU3qWRpaw= github.com/armosec/k8s-interface v0.0.8/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM= -github.com/armosec/k8s-interface v0.0.24 h1:rVFPpx/WqWFbFWDudBjKOhIMIon1Cd/fGFJtE2RBivU= github.com/armosec/k8s-interface v0.0.24/go.mod h1:0ztwEWLez2lpMMKHbs0DoZV64S0YIA4s72vCs9iAAiE= +github.com/armosec/k8s-interface v0.0.27 h1:jVchKZT+PCtys0YbwEGoaG7OF0ebTZSEx9igu2oZ3wc= +github.com/armosec/k8s-interface v0.0.27/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU= github.com/armosec/opa-utils v0.0.57 h1:7lDEKxblqfsEXLn+6lkj17ctBSnhDuYanfdqG55kW2g= github.com/armosec/opa-utils v0.0.57/go.mod h1:UAT4Xokq91ysLa4Xg0WLqVsjJCnbFgsevkiIJFxTghU= github.com/armosec/rbac-utils v0.0.1 h1:N2MI98F/0zbDjmRZ29CNElU1AXkFLk5csd/qAHOBdXY= diff --git a/resourcehandler/fieldselector.go b/resourcehandler/fieldselector.go index 6dd977cc..56563f10 100644 --- a/resourcehandler/fieldselector.go +++ b/resourcehandler/fieldselector.go @@ -54,7 +54,9 @@ func getNamespacesSelector(resource *schema.GroupVersionResource, ns, operator s } namespacesSlice := strings.Split(ns, ",") for _, n := range namespacesSlice { - fieldSelectors += fmt.Sprintf("%s%s%s,", fieldSelector, operator, n) + if n != "" { + fieldSelectors += fmt.Sprintf("%s%s%s,", fieldSelector, operator, n) + } } return fieldSelectors diff --git a/resourcehandler/fieldselector_test.go b/resourcehandler/fieldselector_test.go new file mode 100644 index 00000000..147818e0 --- /dev/null +++ b/resourcehandler/fieldselector_test.go @@ -0,0 +1,15 @@ +package resourcehandler + +import ( + "testing" + + "github.com/armosec/k8s-interface/k8sinterface" + "github.com/stretchr/testify/assert" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +func TestGetNamespacesSelector(t *testing.T) { + k8sinterface.InitializeMapResourcesMock() + assert.Equal(t, "metadata.namespace==default,", getNamespacesSelector(&schema.GroupVersionResource{Version: "v1", Resource: "pods"}, "default,", "==")) + assert.Equal(t, "", getNamespacesSelector(&schema.GroupVersionResource{Version: "v1", Resource: "nodes"}, "default,", "==")) +}