From a1db8f1e827365f98f7cc036833ba6d349dc3512 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Mon, 10 May 2021 23:11:17 -0700
Subject: [PATCH] Refactor LaunchTemplate.InstanceInterruptionBehavior

---
 pkg/model/awsmodel/autoscalinggroup.go | 42 ++++++++++++--------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go
index eea6396114..565f71d80d 100644
--- a/pkg/model/awsmodel/autoscalinggroup.go
+++ b/pkg/model/awsmodel/autoscalinggroup.go
@@ -147,25 +147,26 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
 	}
 
 	lt := &awstasks.LaunchTemplate{
-		Name:                    fi.String(name),
-		Lifecycle:               b.Lifecycle,
-		CPUCredits:              fi.String(fi.StringValue(ig.Spec.CPUCredits)),
-		HTTPPutResponseHopLimit: fi.Int64(1),
-		HTTPTokens:              fi.String(ec2.LaunchTemplateHttpTokensStateOptional),
-		IAMInstanceProfile:      link,
-		ImageID:                 fi.String(ig.Spec.Image),
-		InstanceMonitoring:      lc.InstanceMonitoring,
-		InstanceType:            lc.InstanceType,
-		RootVolumeOptimization:  lc.RootVolumeOptimization,
-		RootVolumeSize:          lc.RootVolumeSize,
-		RootVolumeIops:          lc.RootVolumeIops,
-		RootVolumeType:          lc.RootVolumeType,
-		RootVolumeEncryption:    lc.RootVolumeEncryption,
-		SSHKey:                  lc.SSHKey,
-		SecurityGroups:          lc.SecurityGroups,
-		Tags:                    tags,
-		Tenancy:                 lc.Tenancy,
-		UserData:                lc.UserData,
+		Name:                         fi.String(name),
+		Lifecycle:                    b.Lifecycle,
+		CPUCredits:                   fi.String(fi.StringValue(ig.Spec.CPUCredits)),
+		HTTPPutResponseHopLimit:      fi.Int64(1),
+		HTTPTokens:                   fi.String(ec2.LaunchTemplateHttpTokensStateOptional),
+		IAMInstanceProfile:           link,
+		ImageID:                      fi.String(ig.Spec.Image),
+		InstanceInterruptionBehavior: ig.Spec.InstanceInterruptionBehavior,
+		InstanceMonitoring:           lc.InstanceMonitoring,
+		InstanceType:                 lc.InstanceType,
+		RootVolumeOptimization:       lc.RootVolumeOptimization,
+		RootVolumeSize:               lc.RootVolumeSize,
+		RootVolumeIops:               lc.RootVolumeIops,
+		RootVolumeType:               lc.RootVolumeType,
+		RootVolumeEncryption:         lc.RootVolumeEncryption,
+		SSHKey:                       lc.SSHKey,
+		SecurityGroups:               lc.SecurityGroups,
+		Tags:                         tags,
+		Tenancy:                      lc.Tenancy,
+		UserData:                     lc.UserData,
 	}
 
 	{
@@ -247,9 +248,6 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
 	if ig.Spec.SpotDurationInMinutes != nil {
 		lt.SpotDurationInMinutes = ig.Spec.SpotDurationInMinutes
 	}
-	if ig.Spec.InstanceInterruptionBehavior != nil {
-		lt.InstanceInterruptionBehavior = ig.Spec.InstanceInterruptionBehavior
-	}
 	if fi.BoolValue(ig.Spec.RootVolumeEncryption) && ig.Spec.RootVolumeEncryptionKey != nil {
 		lt.RootVolumeKmsKey = ig.Spec.RootVolumeEncryptionKey
 	} else {