Make changes backwards compatible

ActiveState · Nov 21, 2024 · acaa7e1 · acaa7e1
1 parent e091792
commit acaa7e1
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 51 deletions.
diff --git a/cmd/state-svc/internal/server/generated/generated.go b/cmd/state-svc/internal/server/generated/generated.go
diff --git a/cmd/state-svc/schema/schema.graphqls b/cmd/state-svc/schema/schema.graphqls
@@ -53,7 +53,7 @@ enum NotificationPlacementType {
 
 type NotificationInfo {
     id: String!
-    notification: String!
+    message: String!
     condition: String!
     startDate: String!
     endDate: String!

diff --git a/cmd/state/internal/cmdtree/exechandlers/notifier/notifier.go b/cmd/state/internal/cmdtree/exechandlers/notifier/notifier.go
@@ -90,8 +90,8 @@ func (m *Notifier) PrintByPlacement(placement graph.NotificationPlacementType) e
 			m.out.Notice("") // Line break after
 		}
 
-		logging.Debug("Printing notification: %s, %s", notification.ID, notification.Notification)
-		m.out.Notice(notification.Notification)
+		logging.Debug("Printing notification: %s, %s", notification.ID, notification.Message)
+		m.out.Notice(notification.Message)
 
 		if placement == graph.NotificationPlacementTypeBeforeCmd {
 			m.out.Notice("") // Line break before

diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -265,7 +265,7 @@ const VulnerabilitiesAPIPath = "/v13s/v1/graphql"
 const HasuraInventoryAPIPath = "/sv/hasura-inventory/v1/graphql"
 
 // NotificationsInfoURL is the URL we check against to see what versions are deprecated
-const NotificationsInfoURL = "https://state-tool.s3.amazonaws.com/notifications.json"
+const NotificationsInfoURL = "https://state-tool.s3.amazonaws.com/messages.json"
 
 // DateFormatUser is the date format we use when communicating with the end-user
 const DateFormatUser = "January 02, 2006"

diff --git a/internal/graph/generated.go b/internal/graph/generated.go
diff --git a/pkg/platform/api/svc/request/notification.go b/pkg/platform/api/svc/request/notification.go
@@ -16,7 +16,7 @@ func (m *NotificationRequest) Query() string {
 	return `query($command: String!, $flags: [String!]!) {
 		checkNotifications(command: $command, flags: $flags) {
 			id
-			notification
+			message
 			interrupt
 			placement
 		}

diff --git a/test/integration/notification_int_test.go b/test/integration/notification_int_test.go
@@ -42,7 +42,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Defaults",
 			`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification"
+				"Message": "This is a [NOTICE]simple[/RESET] notification"
 			}]`,
 			false,
 			true,
@@ -51,7 +51,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Repeat Hourly",
 			`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"Repeat": "Hourly"
 			}]`,
 			false,
@@ -61,7 +61,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Repeat Constantly",
 			`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"Repeat": "Constantly"
 			}]`,
 			true,
@@ -71,7 +71,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Within Date Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s",
 				"EndDate": "%s"
 			}]`,
@@ -84,7 +84,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Outside Date Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s",
 				"EndDate": "%s"
 			}]`,
@@ -97,7 +97,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Only Start Date - Inside Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s"
 			}]`,
 				time.Now().Add(-1*time.Hour).Format(time.RFC3339)),
@@ -108,7 +108,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Only End Date - Inside Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"EndDate": "%s"
 			}]`,
 				time.Now().Add(1*time.Hour).Format(time.RFC3339)),
@@ -119,7 +119,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Outside Date Range - Future",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s",
 				"EndDate": "%s"
 			}]`,
@@ -132,7 +132,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Outside Date Range - Past",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s",
 				"EndDate": "%s"
 			}]`,
@@ -145,7 +145,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Only Start Date - Outside Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"StartDate": "%s"
 			}]`,
 				time.Now().Add(1*time.Hour).Format(time.RFC3339)),
@@ -156,7 +156,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			"Only End Date - Outside Range",
 			fmt.Sprintf(`[{
 				"ID": "simple",
-				"Notification": "This is a [NOTICE]simple[/RESET] notification",
+				"Message": "This is a [NOTICE]simple[/RESET] notification",
 				"EndDate": "%s"
 			}]`,
 				time.Now().Add(-1*time.Hour).Format(time.RFC3339)),
@@ -169,7 +169,7 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic() {
 			ts := e2e.New(suite.T(), false)
 			defer ts.Close()
 
-			msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "notifications.json", []byte(tt.MessageJson), 0755)
+			msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "messages.json", []byte(tt.MessageJson), 0755)
 			suite.Require().NoError(err)
 
 			cp := ts.SpawnWithOpts(e2e.OptArgs("--version"), e2e.OptAppendEnv(constants.NotificationsOverrideEnvVarName+"="+msgFile))
@@ -201,10 +201,10 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic_PlacementA
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "notifications.json", []byte(fmt.Sprintf(`[
+	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "messages.json", []byte(fmt.Sprintf(`[
 	{
 		"ID": "simple",
-		"Notification": "This is a [NOTICE]simple[/RESET] notification",
+		"Message": "This is a [NOTICE]simple[/RESET] notification",
 		"Placement": "%s"
 	}
 ]`, graph.NotificationPlacementTypeAfterCmd)), 0755)
@@ -221,10 +221,10 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic_InterruptP
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "notifications.json", []byte(fmt.Sprintf(`[
+	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "messages.json", []byte(fmt.Sprintf(`[
 	{
 		"ID": "simple",
-		"Notification": "This is a [NOTICE]simple[/RESET] notification",
+		"Message": "This is a [NOTICE]simple[/RESET] notification",
 		"Repeat": "Constantly",
 		"Interrupt": "%s"
 	}
@@ -253,10 +253,10 @@ func (suite *NotificationIntegrationTestSuite) TestNotification_Basic_InterruptE
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "notifications.json", []byte(fmt.Sprintf(`[
+	msgFile, err := fileutils.WriteTempFileToDir(ts.Dirs.Work, "messages.json", []byte(fmt.Sprintf(`[
 	{
 		"ID": "simple",
-		"Notification": "This is a [NOTICE]simple[/RESET] notification",
+		"Message": "This is a [NOTICE]simple[/RESET] notification",
 		"Interrupt": "%s"
 	}
 ]`, graph.NotificationInterruptTypeExit)), 0755)