remove event schema version checks (#748)

cjerad · web-flow · commit 44d577310964 · 2022-12-13T11:26:29.000-06:00
diff --git a/pkg/event/asgterminate/v1/parser.go b/pkg/event/asgterminate/v1/parser.go
@@ -27,7 +27,6 @@ import (
 const (
 	source             = "aws.autoscaling"
 	detailType         = "EC2 Instance-terminate Lifecycle Action"
-	version            = "1"
 	acceptedTransition = "autoscaling:EC2_INSTANCE_TERMINATING"
 )
 
@@ -48,7 +47,7 @@ func (p Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/pkg/event/asgterminate/v2/parser.go b/pkg/event/asgterminate/v2/parser.go
@@ -27,7 +27,6 @@ import (
 const (
 	source             = "aws.autoscaling"
 	detailType         = "EC2 Instance-terminate Lifecycle Action"
-	version            = "2"
 	acceptedTransition = "autoscaling:EC2_INSTANCE_TERMINATING"
 )
 
@@ -48,7 +47,7 @@ func (p Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/pkg/event/rebalancerecommendation/v0/parser.go b/pkg/event/rebalancerecommendation/v0/parser.go
@@ -27,7 +27,6 @@ import (
 const (
 	source     = "aws.ec2"
 	detailType = "EC2 Instance Rebalance Recommendation"
-	version    = "0"
 )
 
 type Parser struct{}
@@ -43,7 +42,7 @@ func (Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/pkg/event/scheduledchange/v1/parser.go b/pkg/event/scheduledchange/v1/parser.go
@@ -27,7 +27,6 @@ import (
 const (
 	source                    = "aws.health"
 	detailType                = "AWS Health Event"
-	version                   = "1"
 	acceptedService           = "EC2"
 	acceptedEventTypeCategory = "scheduledChange"
 )
@@ -45,7 +44,7 @@ func (Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/pkg/event/spotinterruption/v1/parser.go b/pkg/event/spotinterruption/v1/parser.go
@@ -27,7 +27,6 @@ import (
 const (
 	source     = "aws.ec2"
 	detailType = "EC2 Spot Instance Interruption Warning"
-	version    = "1"
 )
 
 type Parser struct{}
@@ -43,7 +42,7 @@ func (Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/pkg/event/statechange/v1/parser.go b/pkg/event/statechange/v1/parser.go
@@ -28,7 +28,6 @@ import (
 const (
 	source         = "aws.ec2"
 	detailType     = "EC2 Instance State-change Notification"
-	version        = "1"
 	acceptedStates = "stopping,stopped,shutting-down,terminated"
 )
 
@@ -47,7 +46,7 @@ func (Parser) Parse(ctx context.Context, str string) terminator.Event {
 		return nil
 	}
 
-	if evt.Source != source || evt.DetailType != detailType || evt.Version != version {
+	if evt.Source != source || evt.DetailType != detailType {
 		return nil
 	}
 
diff --git a/resources/queue-infrastructure.yaml b/resources/queue-infrastructure.yaml
@@ -39,9 +39,6 @@ Resources:
           - aws.autoscaling
         detail-type:
           - EC2 Instance-terminate Lifecycle Action
-        version:
-          - "1"
-          - "2"
         detail:
           LifecycleTransition:
             - "autoscaling:EC2_INSTANCE_TERMINATING"
@@ -60,8 +57,6 @@ Resources:
           - aws.ec2
         detail-type:
           - EC2 Instance Rebalance Recommendation
-        version:
-          - "0"
       State: ENABLED
       Targets:
         - Id: !GetAtt Queue.QueueName
@@ -77,8 +72,6 @@ Resources:
           - aws.health
         detail-type:
           - AWS Health Event
-        version:
-          - "1"
         detail:
           source:
             - EC2
@@ -99,8 +92,6 @@ Resources:
           - aws.ec2
         detail-type:
           - EC2 Spot Instance Interruption Warning
-        version:
-          - "1"
       State: ENABLED
       Targets:
         - Id: !GetAtt Queue.QueueName
@@ -116,8 +107,6 @@ Resources:
           - aws.ec2
         detail-type:
           - EC2 Instance State-change Notification
-        version:
-          - "1"
         detail:
           state:
             - stopping

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ import (`
`27`	`27`	`const (`
`28`	`28`	`source = "aws.autoscaling"`
`29`	`29`	`detailType = "EC2 Instance-terminate Lifecycle Action"`
`30`		`- version = "1"`
`31`	`30`	`acceptedTransition = "autoscaling:EC2_INSTANCE_TERMINATING"`
`32`	`31`	`)`
`33`	`32`
`@@ -48,7 +47,7 @@ func (p Parser) Parse(ctx context.Context, str string) terminator.Event {`
`48`	`47`	`return nil`
`49`	`48`	`}`
`50`	`49`
`51`		`- if evt.Source != source \|\| evt.DetailType != detailType \|\| evt.Version != version {`
	`50`	`+ if evt.Source != source \|\| evt.DetailType != detailType {`
`52`	`51`	`return nil`
`53`	`52`	`}`
`54`	`53`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ import (`
`28`	`28`	`const (`
`29`	`29`	`source = "aws.ec2"`
`30`	`30`	`detailType = "EC2 Instance State-change Notification"`
`31`		`- version = "1"`
`32`	`31`	`acceptedStates = "stopping,stopped,shutting-down,terminated"`
`33`	`32`	`)`
`34`	`33`
`@@ -47,7 +46,7 @@ func (Parser) Parse(ctx context.Context, str string) terminator.Event {`
`47`	`46`	`return nil`
`48`	`47`	`}`
`49`	`48`
`50`		`- if evt.Source != source \|\| evt.DetailType != detailType \|\| evt.Version != version {`
	`49`	`+ if evt.Source != source \|\| evt.DetailType != detailType {`
`51`	`50`	`return nil`
`52`	`51`	`}`
`53`	`52`