Merge pull request #358 from MUzairS15/MUzairS15/events

Add status and filter opts for `events`
meshery · Sep 2, 2023 · 6467f33 · 6467f33
2 parents ae6e13e + a593a0d
commit 6467f33
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/models/events/build.go b/models/events/build.go
@@ -1,11 +1,18 @@
 package events
 
 import (
+	"encoding/json"
 	"time"
 
 	"github.com/gofrs/uuid"
+	"gorm.io/gorm"
 )
 
+func (e *Event) BeforeCreate(tx *gorm.DB) (err error) {
+    e.ID, _ = uuid.NewV4()
+    return
+}
+
 type EventBuilder struct {
 	event Event
 }
@@ -40,8 +47,9 @@ func (e *EventBuilder) WithAction(eventAction string) *EventBuilder {
 	return e
 }
 
-func (e *EventBuilder) WithMetadata(metadata interface{}) *EventBuilder {
-	e.event.Metadata = metadata
+func (e *EventBuilder) WithMetadata(metadata map[string]interface{}) *EventBuilder {
+	b, _ := json.Marshal(metadata)
+	e.event.Metadata = b
 	return e
 }
 
@@ -50,6 +58,11 @@ func (e *EventBuilder) WithSeverity(severity EventSeverity) *EventBuilder {
 	return e
 }
 
+func (e *EventBuilder) WithStatus(status string) *EventBuilder {
+	e.event.Status = status
+	return e
+}
+
 func (e *EventBuilder) FromUser(id uuid.UUID) *EventBuilder {
 	e.event.UserID = &id
 	return e

diff --git a/models/events/events.go b/models/events/events.go
diff --git a/models/meshmodel/registry/host.go b/models/meshmodel/registry/host.go
@@ -3,7 +3,6 @@ package registry
 import (
 	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -67,15 +66,15 @@ func (ah ArtifactHub) HandleDependents(comp v1alpha1.Component, kc *kubernetes.C
 		})
 		if err != nil {
 			if !isDeploy {
-				summary = fmt.Sprintf("error undeploying dependent resources for %s, please proceed with manual uninstall or try again: %s", strings.TrimSuffix(comp.Spec.Type, ".K8s"), comp.Name)
+				summary = fmt.Sprintf("error undeploying dependent helm chart for %s, please proceed with manual uninstall or try again", comp.Name)
 			} else {
-				summary = fmt.Sprintf("error deploying dependent resources for %s, please procced with manual install or try again: %s", strings.TrimSuffix(comp.Spec.Type, ".K8s"), comp.Name)
+				summary = fmt.Sprintf("error deploying dependent helm chart for %s, please procced with manual install or try again", comp.Name)
 			}
 		} else {
 			if !isDeploy {
-				summary = fmt.Sprintf("Undeployed helm chart%s: %s", strings.TrimSuffix(comp.Spec.Type, ".K8s"), comp.Name)
+				summary = fmt.Sprintf("Undeployed dependent helm chart for %s", comp.Name)
 			} else {
-				summary = fmt.Sprintf("Deployed helm chart%s: %s", strings.TrimSuffix(comp.Spec.Type, ".K8s"), comp.Name)
+				summary = fmt.Sprintf("Deployed dependent helm chart for %s", comp.Name)
 			}
 		}
 	}