ignore test notification Event (#640)

Author: cjerad

pkg/monitor/sqsevent/asg-lifecycle-event.go

@@ -48,13 +48,16 @@ import (
 }
 */
 
+const TEST_NOTIFICATION = "autoscaling:TEST_NOTIFICATION"
+
 // LifecycleDetail provides the ASG lifecycle event details
 type LifecycleDetail struct {
 	LifecycleActionToken string `json:"LifecycleActionToken"`
 	AutoScalingGroupName string `json:"AutoScalingGroupName"`
 	LifecycleHookName    string `json:"LifecycleHookName"`
 	EC2InstanceID        string `json:"EC2InstanceId"`
 	LifecycleTransition  string `json:"LifecycleTransition"`
+	Event                string `json:"Event"`
 	RequestID            string `json:"RequestId"`
 	Time                 string `json:"Time"`
 }
@@ -66,7 +69,7 @@ func (m SQSMonitor) asgTerminationToInterruptionEvent(event *EventBridgeEvent, m
 		return nil, err
 	}
 
-	if lifecycleDetail.LifecycleTransition == "autoscaling:TEST_NOTIFICATION" {
+	if lifecycleDetail.Event == TEST_NOTIFICATION || lifecycleDetail.LifecycleTransition == TEST_NOTIFICATION {
 		return nil, skip{fmt.Errorf("message is an ASG test notification")}
 	}
 

pkg/monitor/sqsevent/sqs-monitor.go

@@ -136,7 +136,7 @@ func (m SQSMonitor) processLifecycleEventFromASG(message *sqs.Message) (EventBri
 		log.Err(err).Msg("only lifecycle events from ASG to SQS are supported outside EventBridge")
 		return eventBridgeEvent, err
 
-	case lifecycleEvent.LifecycleTransition == "autoscaling:TEST_NOTIFICATION":
+	case lifecycleEvent.Event == TEST_NOTIFICATION || lifecycleEvent.LifecycleTransition == TEST_NOTIFICATION:
 		log.Warn().Msg("ignoring ASG test notification")
 		return eventBridgeEvent, skip{fmt.Errorf("message is a test notification")}
 

pkg/monitor/sqsevent/sqs-monitor_test.go

@@ -89,13 +89,15 @@ var asgLifecycleTestNotification = sqsevent.EventBridgeEvent{
 		"arn:aws:autoscaling:us-east-1:123456789012:autoScalingGroup:26e7234b-03a4-47fb-b0a9-2b241662774e:autoScalingGroupName/nth-test1",
 	},
 	Detail: []byte(`{
+		"Event": "autoscaling:TEST_NOTIFICATION",
 		"LifecycleTransition": "autoscaling:TEST_NOTIFICATION"
 	  }`),
 }
 
 var asgLifecycleTestNotificationFromSQS = sqsevent.LifecycleDetail{
 	LifecycleHookName:    "test-nth-asg-to-sqs",
 	RequestID:            "3775fac9-93c3-7ead-8713-159816566000",
+	Event:                "autoscaling:TEST_NOTIFICATION",
 	LifecycleTransition:  "autoscaling:TEST_NOTIFICATION",
 	AutoScalingGroupName: "my-asg",
 	Time:                 "2022-01-31T23:07:47.872Z",