Merge pull request #6 from triggermesh/task/example-kuard

kuard handler example

Author: Pablo Mercado

cmd/triggermesh-hook/main.go

@@ -1,3 +1,6 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
 package main
 
 import (

cmd/triggermesh-hook/start/start.go

@@ -5,6 +5,9 @@ package start
 
 import (
 	commoncmd "github.com/triggermesh/scoby-hook-triggermesh/pkg/common/cmd"
+	"github.com/triggermesh/scoby-hook-triggermesh/pkg/handler"
+	"github.com/triggermesh/scoby-hook-triggermesh/pkg/handler/kuards"
+
 	"github.com/triggermesh/scoby-hook-triggermesh/pkg/server"
 )
 
@@ -13,9 +16,14 @@ type Cmd struct {
 	Path    string `help:"Path where hook requests are served." env:"PATH" default:"v1"`
 }
 
-func (c *Cmd) Run(globals *commoncmd.Globals) error {
-	globals.Logger.Debug("Creating TriggerMesh hook server")
+func (c *Cmd) Run(g *commoncmd.Globals) error {
+	g.Logger.Debug("Creating TriggerMesh hook server")
+
+	r := handler.NewRegistry([]handler.Handler{
+		// Kuards is a temporary playground
+		kuards.New(),
+	})
 
-	s := server.New(c.Path, c.Address, globals.Logger)
-	return s.Start(globals.Context)
+	s := server.New(c.Path, c.Address, r, g.DynClient, g.Logger)
+	return s.Start(g.Context)
 }

pkg/common/cmd/globals.go

@@ -1,3 +1,6 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
 package cmd
 
 import (
@@ -14,6 +17,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
+	kdclient "k8s.io/client-go/dynamic"
 	kclient "k8s.io/client-go/kubernetes"
 
 	"github.com/triggermesh/scoby-hook-triggermesh/pkg/config/observability"
@@ -43,6 +47,7 @@ type Globals struct {
 	Logger       *zap.SugaredLogger `kong:"-"`
 	LogLevel     zap.AtomicLevel    `kong:"-"`
 	KubeClient   kclient.Interface  `kong:"-"`
+	DynClient    kdclient.Interface `kong:"-"`
 	ConfigMethod ConfigMethod       `kong:"-"`
 }
 
@@ -83,11 +88,11 @@ func (g *Globals) Initialize() error {
 	defaultConfigApplied := false
 	var err error
 
-	kcfg, err := kubernetes.NewClient(g.Kubeconfig)
+	kc, kdc, err := kubernetes.NewClients(g.Kubeconfig)
 	if err != nil {
 		return err
 	}
-	g.KubeClient = kcfg
+	g.KubeClient, g.DynClient = kc, kdc
 
 	switch {
 	case g.ObservabilityConfig != "":

pkg/handler/handler.go

@@ -0,0 +1,31 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package handler
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	hookv1 "github.com/triggermesh/scoby/pkg/hook/v1"
+)
+
+type HandlerD struct {
+	GVR  schema.GroupVersionResource
+	Kind string
+}
+
+// Handler exposes methods for hook handler registration and reconciling.
+type Handler interface {
+	// GVR for the managed object
+	GroupVersionResource() *schema.GroupVersionResource
+	// Kind for the managed object
+	Kind() string
+
+	Reconcile(obj metav1.Object) *hookv1.HookResponse
+}
+
+// HandlerFinalizable exposes methods for hook handler finalize operation.
+type HandlerFinalizable interface {
+	Finalize(obj metav1.Object) *hookv1.HookResponse
+}

pkg/handler/kuards/kuards.go

@@ -0,0 +1,79 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package kuards
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	commonv1alpha1 "github.com/triggermesh/scoby/pkg/apis/common/v1alpha1"
+	hookv1 "github.com/triggermesh/scoby/pkg/hook/v1"
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/triggermesh/scoby-hook-triggermesh/pkg/handler"
+)
+
+type KuardHandler struct {
+	gvr  schema.GroupVersionResource
+	kind string
+}
+
+var _ handler.Handler = (*KuardHandler)(nil)
+
+func New() *KuardHandler {
+	return &KuardHandler{
+		gvr: schema.GroupVersionResource{
+			Group:    "extensions.triggermesh.io",
+			Version:  "v1",
+			Resource: "kuards",
+		},
+		kind: "Kuard",
+	}
+}
+
+func (h *KuardHandler) GroupVersionResource() *schema.GroupVersionResource {
+	return &h.gvr
+}
+
+// Kind for the managed object
+func (h *KuardHandler) Kind() string {
+	return h.kind
+}
+
+func (h *KuardHandler) Reconcile(obj metav1.Object) *hookv1.HookResponse {
+	return &hookv1.HookResponse{
+		Status: &hookv1.HookStatus{
+			Conditions: commonv1alpha1.Conditions{
+				{
+					Type:   "HookReportedStatus",
+					Status: metav1.ConditionTrue,
+					Reason: "HOOKREPORTSOK",
+				},
+			},
+			Annotations: map[string]string{
+				"io.triggermesh.hook/my-annotation": "annotation from hook",
+			},
+		},
+		EnvVars: []corev1.EnvVar{
+			{
+				Name:  "FROM_HOOK_NAME",
+				Value: obj.GetName(),
+			},
+			{
+				Name:  "FROM_HOOK_NAMESPACE",
+				Value: obj.GetNamespace(),
+			},
+		},
+	}
+}
+
+func (h *KuardHandler) Finalize(obj metav1.Object) *hookv1.HookResponse {
+	return &hookv1.HookResponse{
+		Status: &hookv1.HookStatus{
+			Annotations: map[string]string{
+				"io.triggermesh.hook/my-annotation": "deletion ok",
+			},
+		},
+	}
+}

pkg/handler/registry.go

@@ -0,0 +1,25 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package handler
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type Registry map[schema.GroupVersionKind]Handler
+
+func NewRegistry(h []Handler) Registry {
+	r := make(map[schema.GroupVersionKind]Handler, len(h))
+
+	for i := range h {
+		gvr := h[i].GroupVersionResource()
+		r[schema.GroupVersionKind{
+			Group:   gvr.Group,
+			Version: gvr.Version,
+			Kind:    h[i].Kind(),
+		}] = h[i]
+	}
+
+	return r
+}

pkg/kubernetes/client.go

@@ -1,9 +1,13 @@
+// Copyright 2023 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
 package kubernetes
 
 import (
 	"os"
 	"path/filepath"
 
+	kdclient "k8s.io/client-go/dynamic"
 	kclient "k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -32,11 +36,21 @@ func NewConfig(path string) (*restclient.Config, error) {
 	return restclient.InClusterConfig()
 }
 
-func NewClient(path string) (kclient.Interface, error) {
+func NewClients(path string) (kclient.Interface, kdclient.Interface, error) {
 	cfg, err := NewConfig(path)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
+	}
+
+	kc, err := kclient.NewForConfig(cfg)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	kdc, err := kdclient.NewForConfig(cfg)
+	if err != nil {
+		return nil, nil, err
 	}
 
-	return kclient.NewForConfig(cfg)
+	return kc, kdc, err
 }