From a5ae35fbcb8dd2ce3e56d6b86d6f680dcf3f6bf8 Mon Sep 17 00:00:00 2001
From: Rajiv Senthilnathan <rsenthil@redhat.com>
Date: Tue, 6 Feb 2024 10:51:04 -0500
Subject: [PATCH 1/2] Make the idler template generic

---
 .../sandbox/idlertriggered/notification.html               | 7 +++----
 .../sandbox/idlertriggered/subject.txt                     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html b/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
index ef3bb7cb4..4a0005ea5 100644
--- a/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
+++ b/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>
-        Notice: Your running application in namespace has been idled
+        Notice: Your running workload has been idled
     </title>
     <style>
         a:hover {
@@ -41,13 +41,12 @@
 >
 
     <p>
-        You are receiving this email because one or more of your applications in the Developer Sandbox for
+        You are receiving this email because one or more of your workloads in the Developer Sandbox for
         Red Hat OpenShift has been running for 12 hours.
     </p>
 
     <p>
-        In accordance with the usage terms of Developer Sandbox, we have reduced the number of instances of your
-        application {{.AppType}} {{.AppName}} to zero (0). You can restart your application(s) by increasing the number of instances from the
+        In accordance with the usage terms of Developer Sandbox, we have scaled down your workload {{.AppType}} {{.AppName}}. You can restart your workload(s) or scale up the number of instances from the
         Developer Sandbox User Interface.
     </p>
 
diff --git a/deploy/templates/notificationtemplates/sandbox/idlertriggered/subject.txt b/deploy/templates/notificationtemplates/sandbox/idlertriggered/subject.txt
index 9c323e1c3..abc76b8d7 100644
--- a/deploy/templates/notificationtemplates/sandbox/idlertriggered/subject.txt
+++ b/deploy/templates/notificationtemplates/sandbox/idlertriggered/subject.txt
@@ -1 +1 @@
-Notice: Your running application in namespace {{.Namespace}} has been idled
\ No newline at end of file
+Notice: Your running workload in namespace {{.Namespace}} has been idled
\ No newline at end of file

From e1741cee0778417f13a9e4928af8bb311bc5dcb0 Mon Sep 17 00:00:00 2001
From: Rajiv Senthilnathan <rsenthil@redhat.com>
Date: Tue, 6 Feb 2024 11:50:35 -0500
Subject: [PATCH 2/2] Test

---
 .../sandbox/idlertriggered/notification.html                  | 2 +-
 .../notificationtemplates/notification_generator_test.go      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html b/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
index 4a0005ea5..db727e4d7 100644
--- a/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
+++ b/deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html
@@ -46,7 +46,7 @@
     </p>
 
     <p>
-        In accordance with the usage terms of Developer Sandbox, we have scaled down your workload {{.AppType}} {{.AppName}}. You can restart your workload(s) or scale up the number of instances from the
+        In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down. You can restart your workload(s) or scale up the number of instances from the
         Developer Sandbox User Interface.
     </p>
 
diff --git a/pkg/templates/notificationtemplates/notification_generator_test.go b/pkg/templates/notificationtemplates/notification_generator_test.go
index fb2d8d930..e056a2321 100644
--- a/pkg/templates/notificationtemplates/notification_generator_test.go
+++ b/pkg/templates/notificationtemplates/notification_generator_test.go
@@ -65,8 +65,8 @@ func TestGetNotificationTemplate(t *testing.T) {
 			// then
 			require.NoError(t, err)
 			require.NotNil(t, template)
-			assert.Equal(t, "Notice: Your running application in namespace {{.Namespace}} has been idled", template.Subject)
-			assert.Contains(t, template.Content, "In accordance with the usage terms of Developer Sandbox, we have reduced the number of instances of your\n        application {{.AppType}} {{.AppName}} to zero (0).")
+			assert.Equal(t, "Notice: Your running workload in namespace {{.Namespace}} has been idled", template.Subject)
+			assert.Contains(t, template.Content, "In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down.")
 
 		})
 	})