From b2d4a4ce03d6c17097bc65576d746c9795dc8652 Mon Sep 17 00:00:00 2001
From: Nick Hale <4175918+njhale@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:23:13 -0400
Subject: [PATCH 1/2] Rename event severity warn to error and rm critical

Refactor event severity such that only two levels remain:
1. "info"
2. "error"

This means removing the unused "critical" severity and renaming "warn"
to "error".

Signed-off-by: Nick Hale <4175918+njhale@users.noreply.github.com>
---
 pkg/apis/internal.acorn.io/v1/event.go            | 9 ++-------
 pkg/controller/appdefinition/pullappimage.go      | 2 +-
 pkg/controller/appdefinition/pullappimage_test.go | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkg/apis/internal.acorn.io/v1/event.go b/pkg/apis/internal.acorn.io/v1/event.go
index f6ea87bd2..4ffb1146c 100644
--- a/pkg/apis/internal.acorn.io/v1/event.go
+++ b/pkg/apis/internal.acorn.io/v1/event.go
@@ -97,15 +97,10 @@ func (t *MicroTime) UnmarshalJSON(b []byte) error {
 
 const (
 	// EventSeverityInfo indicates an event describes a system operating "as expected".
-	// It is the lowest severity level.
 	EventSeverityInfo EventSeverity = "info"
 
-	// EventSeverityWarn indicates an event describes a recoverable error.
-	EventSeverityWarn EventSeverity = "warn"
-
-	// EventSeverityCritical indicates an event describes an unrecoverable error.
-	// It is the highest severity level.
-	EventSeverityCritical EventSeverity = "critical"
+	// EventSeverityError indicates an event describes an error.
+	EventSeverityError EventSeverity = "warn"
 )
 
 // EventSeverity indicates the severity of an event.
diff --git a/pkg/controller/appdefinition/pullappimage.go b/pkg/controller/appdefinition/pullappimage.go
index ca643fc01..8a9267075 100644
--- a/pkg/controller/appdefinition/pullappimage.go
+++ b/pkg/controller/appdefinition/pullappimage.go
@@ -226,7 +226,7 @@ func recordPullEvent(ctx context.Context, recorder event.Recorder, observed meta
 	if err != nil {
 		// It's a failure, overwrite with failure event values
 		e.Type = AppImagePullFailureEventType
-		e.Severity = v1.EventSeverityWarn
+		e.Severity = v1.EventSeverityError
 		e.Description = fmt.Sprintf("Failed to pull %s", target.Name)
 		details.Err = err.Error()
 	}
diff --git a/pkg/controller/appdefinition/pullappimage_test.go b/pkg/controller/appdefinition/pullappimage_test.go
index 8833993ca..2ca5524b3 100644
--- a/pkg/controller/appdefinition/pullappimage_test.go
+++ b/pkg/controller/appdefinition/pullappimage_test.go
@@ -171,7 +171,7 @@ func TestPullAppImageEvents(t *testing.T) {
 		&apiv1.Event{
 			Type:        AppImagePullFailureEventType,
 			Actor:       "acorn-system",
-			Severity:    v1.EventSeverityWarn,
+			Severity:    v1.EventSeverityError,
 			Description: "Failed to pull acorn.io/img:1",
 			Source:      v1.EventSource{Kind: "app", Name: "foo"},
 			Observed:    now,

From 89ed7f720ce36369c391dbd492e5fc7ac99420b8 Mon Sep 17 00:00:00 2001
From: Nick Hale <4175918+njhale@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:44:47 -0400
Subject: [PATCH 2/2] Correct EventSeverityError declaration

Co-authored-by: Tyler Slaton <54378333+tylerslaton@users.noreply.github.com>
Signed-off-by: Nick Hale <4175918+njhale@users.noreply.github.com>
---
 pkg/apis/internal.acorn.io/v1/event.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/apis/internal.acorn.io/v1/event.go b/pkg/apis/internal.acorn.io/v1/event.go
index 4ffb1146c..fd190fe33 100644
--- a/pkg/apis/internal.acorn.io/v1/event.go
+++ b/pkg/apis/internal.acorn.io/v1/event.go
@@ -100,7 +100,7 @@ const (
 	EventSeverityInfo EventSeverity = "info"
 
 	// EventSeverityError indicates an event describes an error.
-	EventSeverityError EventSeverity = "warn"
+	EventSeverityError EventSeverity = "error"
 )
 
 // EventSeverity indicates the severity of an event.