Support singular and short resources names in filters

So a given k8s resources can be filter by it's name (plural,
eg. "enpoints"), it's singular ("endpoint") or one of it's
short names (eg. "ep", "deploy", "po"...).

Author: bpineau

README.md

@@ -37,7 +37,7 @@ will help to keep resources usage low, and a concise git history. Eg.:
 
 katafygio -e /tmp/kfdump \
   -g https://user:[email protected]/myorg/myrepos.git \
-  -x secret,pod,event,replicaset,node,endpoints \
+  -x secret,pod,event,replicaset,node,endpoint \
   -y configmap:kube-system/leader-elector
 ```
 

pkg/observer/observer.go

@@ -185,7 +185,7 @@ func (c *Observer) expandAndFilterAPIResources(groups []*metav1.APIResourceList)
 			}
 
 			// remove user filtered objet kinds
-			if isExcluded(c.excludedkind, ar.Kind) {
+			if isExcluded(c.excludedkind, ar) {
 				continue
 			}
 
@@ -210,12 +210,26 @@ func (c *Observer) expandAndFilterAPIResources(groups []*metav1.APIResourceList)
 	return resources
 }
 
-func isExcluded(excluded []string, name string) bool {
-	lname := strings.ToLower(name)
+func isExcluded(excluded []string, ar metav1.APIResource) bool {
+	lname := strings.ToLower(ar.Name)
+	singular := strings.ToLower(ar.SingularName)
+
 	for _, ctl := range excluded {
-		if strings.Compare(lname, strings.ToLower(ctl)) == 0 {
+		excl := strings.ToLower(ctl)
+
+		if strings.Compare(lname, excl) == 0 {
+			return true
+		}
+
+		if strings.Compare(singular, excl) == 0 {
 			return true
 		}
+
+		for _, alt := range ar.ShortNames {
+			if strings.Compare(strings.ToLower(alt), excl) == 0 {
+				return true
+			}
+		}
 	}
 
 	return false

pkg/observer/observer_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/bpineau/katafygio/pkg/controller"
 	"github.com/bpineau/katafygio/pkg/event"
 
-	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -92,7 +92,7 @@ var resourcesTests = []resTest{
 		expect:  []string{"deployment"},
 		resources: []*metav1.APIResourceList{
 			{
-				GroupVersion: appsv1beta2.SchemeGroupVersion.String(),
+				GroupVersion: appsv1.SchemeGroupVersion.String(),
 				APIResources: []metav1.APIResource{
 					{Name: "deployments", Namespaced: true, Kind: "Deployment", Verbs: stdVerbs},
 				},
@@ -262,3 +262,27 @@ func TestObserverRecoverFromDicoveryFailure(t *testing.T) {
 		t.Errorf("%s failed: expected %v actual %v", "Recover from failure", expected, factory.names)
 	}
 }
+
+func TestExclusion(t *testing.T) {
+	excluded := []string{"rs", "poD", "endpoints"} // short, singular, plural forms
+
+	if isExcluded(excluded,
+		metav1.APIResource{Name: "Foos", Kind: "Foo", SingularName: "Foo", ShortNames: []string{}}) {
+		t.Error("exclusions shouldn't filter more than specified")
+	}
+
+	if !isExcluded(excluded,
+		metav1.APIResource{Name: "Endpoints", Kind: "Endpoints", SingularName: "Endpoint", ShortNames: []string{"ep"}}) {
+		t.Error("exclusions should work on plural resource names")
+	}
+
+	if !isExcluded(excluded,
+		metav1.APIResource{Name: "Pods", Kind: "Pod", SingularName: "Pod", ShortNames: []string{"po"}}) {
+		t.Error("exclusions should ignore objects case")
+	}
+
+	if !isExcluded(excluded,
+		metav1.APIResource{Name: "Replicasets", Kind: "ReplicaSet", SingularName: "replicaset", ShortNames: []string{"rs"}}) {
+		t.Error("exclusions should support resources shortnames")
+	}
+}