refactor(*): design patterns, cleanup, and more

Author: Andrew Rynhard

pkg/argus.go

@@ -9,7 +9,6 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/etcd"
 	"github.com/logicmonitor/k8s-argus/pkg/tree"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
-	"github.com/logicmonitor/k8s-argus/pkg/watch"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/namespace"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/node"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/pod"
@@ -25,7 +24,7 @@ import (
 // Argus represents the Argus cli.
 type Argus struct {
 	*types.Base
-	Watchers []watch.Watcher
+	Watchers []types.Watcher
 }
 
 func newLMClient(id, key, company string) *lm.DefaultApi {
@@ -89,7 +88,7 @@ func NewArgus(base *types.Base) (*Argus, error) {
 		return nil, err
 	}
 
-	argus.Watchers = []watch.Watcher{
+	argus.Watchers = []types.Watcher{
 		namespace.Watcher{
 			Base:         base,
 			DeviceGroups: deviceGroups,

pkg/tree/devicegroup/devicegroup.go

@@ -128,6 +128,20 @@ func Find(parentID int32, name string, client *lm.DefaultApi) (*lm.RestDeviceGro
 	return deviceGroup, nil
 }
 
+// DeleteSubGroup deletes a subgroup from a device group with the specified
+// name.
+func DeleteSubGroup(deviceGroup *lm.RestDeviceGroup, name string, client *lm.DefaultApi) error {
+	for _, subGroup := range deviceGroup.SubGroups {
+		if subGroup.Name != name {
+			continue
+		}
+		restResponse, apiResponse, err := client.DeleteDeviceGroupById(subGroup.Id, true)
+		return utilities.CheckAllErrors(restResponse, apiResponse, err)
+	}
+
+	return nil
+}
+
 func create(name, appliesTo string, disableAlerting bool, parentID int32, client *lm.DefaultApi) (*lm.RestDeviceGroup, error) {
 	restResponse, apiResponse, err := client.AddDeviceGroup(lm.RestDeviceGroup{
 		Name:            name,

pkg/types/types.go

@@ -4,6 +4,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/config"
 	lm "github.com/logicmonitor/lm-sdk-go"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/runtime"
 )
 
 // Base is a struct for embedding
@@ -12,3 +13,12 @@ type Base struct {
 	K8sClient *kubernetes.Clientset
 	Config    *config.Config
 }
+
+// Watcher is the LogicMonitor Watcher interface.
+type Watcher interface {
+	Resource() string
+	ObjType() runtime.Object
+	AddFunc() func(obj interface{})
+	DeleteFunc() func(obj interface{})
+	UpdateFunc() func(oldObj, newObj interface{})
+}

pkg/watch/namespace/namespace.go

@@ -2,7 +2,6 @@ package namespace
 
 import (
 	"github.com/logicmonitor/k8s-argus/pkg/tree/devicegroup"
-	"github.com/logicmonitor/k8s-argus/pkg/utilities"
 
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
@@ -84,19 +83,18 @@ func (w Watcher) DeleteFunc() func(obj interface{}) {
 			deviceGroup, err := devicegroup.Find(parentID, name, w.LMClient)
 			if err != nil {
 				log.Printf("Failed to find namespace %s: %v", name, err)
-
 				return
 			}
-			for _, subGroup := range deviceGroup.SubGroups {
-				if subGroup.Name == namespace.Name {
-					restResponse, apiResponse, err := w.LMClient.DeleteDeviceGroupById(subGroup.Id, true)
-					if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-						log.Errorf("Failed to delete namespace %q: %v", subGroup.Name, _err)
-
-						return
-					}
-				}
+			// We should only be returned a device group if it is namespaced.
+			if deviceGroup == nil {
+				continue
+			}
+			err = devicegroup.DeleteSubGroup(deviceGroup, namespace.Name, w.LMClient)
+			if err != nil {
+				log.Errorf("Failed to delete namespace %q: %v", namespace.Name, err)
+				return
 			}
 		}
+
 	}
 }