chore: a very fat refactor

Author: buroa

cmd/root.go

@@ -10,7 +10,10 @@ import (
 
 	"github.com/home-operations/gatus-sidecar/internal/config"
 	"github.com/home-operations/gatus-sidecar/internal/controller"
-	"github.com/home-operations/gatus-sidecar/internal/manager"
+	"github.com/home-operations/gatus-sidecar/internal/resources/httproute"
+	"github.com/home-operations/gatus-sidecar/internal/resources/ingress"
+	"github.com/home-operations/gatus-sidecar/internal/resources/service"
+	"github.com/home-operations/gatus-sidecar/internal/state"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 )
@@ -21,7 +24,7 @@ func main() {
 	defer cancel()
 
 	// Create a single shared state manager
-	stateManager := manager.NewManager(cfg.Output)
+	stateManager := state.NewManager(cfg.Output)
 
 	restCfg, err := rest.InClusterConfig()
 	if err != nil {
@@ -35,11 +38,11 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Create all controllers
+	// Register default resource types
 	controllers := []*controller.Controller{
-		controller.NewHTTPRouteController(stateManager, dc),
-		controller.NewIngressController(stateManager, dc),
-		controller.NewServiceController(stateManager, dc),
+		controller.New(ingress.Definition(), stateManager, dc),
+		controller.New(httproute.Definition(), stateManager, dc),
+		controller.New(service.Definition(), stateManager, dc),
 	}
 
 	// Run all controllers concurrently

internal/controller/controller.go

@@ -17,30 +17,31 @@ import (
 
 	"github.com/home-operations/gatus-sidecar/internal/config"
 	"github.com/home-operations/gatus-sidecar/internal/endpoint"
-	"github.com/home-operations/gatus-sidecar/internal/handler"
-	"github.com/home-operations/gatus-sidecar/internal/manager"
-)
-
-const (
-	httpsPrefix           = "https://"
-	httpPrefix            = "http://"
-	httpProtocol          = "http"
-	httpsProtocol         = "https"
-	dnsTestURL            = "1.1.1.1"
-	dnsEmptyBodyCondition = "len([BODY]) == 0"
-	dnsQueryType          = "A"
-	ingressCondition      = "[STATUS] == 200"
+	"github.com/home-operations/gatus-sidecar/internal/resources"
+	"github.com/home-operations/gatus-sidecar/internal/state"
 )
 
 type Controller struct {
 	gvr           schema.GroupVersionResource
 	options       metav1.ListOptions
-	handler       handler.ResourceHandler
+	handler       resources.ResourceHandler
 	convert       func(*unstructured.Unstructured) (metav1.Object, error)
-	stateManager  *manager.Manager
+	stateManager  *state.Manager
 	dynamicClient dynamic.Interface
 }
 
+// New creates a controller using a ResourceDefinition
+func New(definition *resources.ResourceDefinition, stateManager *state.Manager, dynamicClient dynamic.Interface) *Controller {
+	return &Controller{
+		gvr:           definition.GVR,
+		options:       metav1.ListOptions{},
+		handler:       resources.NewHandler(definition, dynamicClient),
+		stateManager:  stateManager,
+		dynamicClient: dynamicClient,
+		convert:       definition.ConvertFunc,
+	}
+}
+
 func (c *Controller) GetResource() string {
 	return c.gvr.Resource
 }
@@ -227,24 +228,3 @@ func (c *Controller) deepMergeTemplates(parent, child map[string]any) map[string
 
 	return result
 }
-
-func hasRequiredAnnotations(obj metav1.Object, cfg *config.Config) bool {
-	annotations := obj.GetAnnotations()
-	if annotations == nil {
-		return false
-	}
-
-	_, hasEnabledAnnotation := annotations[cfg.EnabledAnnotation]
-	_, hasTemplateAnnotation := annotations[cfg.TemplateAnnotation]
-
-	return hasEnabledAnnotation || hasTemplateAnnotation
-}
-
-func applyGuardedTemplate(dnsQueryName string, endpoint *endpoint.Endpoint) {
-	endpoint.URL = dnsTestURL
-	endpoint.DNS = map[string]any{
-		"query-name": dnsQueryName,
-		"query-type": dnsQueryType,
-	}
-	endpoint.Conditions = []string{dnsEmptyBodyCondition}
-}