Merge pull request #170 from YoungJinJung/feat/modify-remove-prev-asg-after-timeout

feat:modify remove previous asg after goployer timeout

Author: YoungJinJung

Makefile

@@ -24,7 +24,7 @@ S3_RELEASE_PATH ?= s3://$(RELEASE_BUCKET)/releases/$(VERSION)
 S3_RELEASE_LATEST ?= s3://$(RELEASE_BUCKET)/releases/latest
 S3_BLEEDING_EDGE_LATEST ?= s3://$(RELEASE_BUCKET)/edge/latest
 S3_EXPERIMENTAL_LATEST ?= s3://$(RELEASE_BUCKET)/experimental/latest
-VERSION = 2.1.3
+VERSION = 2.1.4
 
 GCP_ONLY ?= false
 GCP_PROJECT ?= goployer

pkg/deployer/deployer.go

@@ -68,6 +68,7 @@ type Deployer struct {
 	Collector         collector.Collector
 	StepStatus        map[int64]bool
 	DeploymentFlag    map[string]string
+	HealthCheckStatus map[string]bool
 }
 
 type APIAttacker struct {
@@ -99,6 +100,7 @@ func InitDeploymentConfiguration(h *helper.DeployerHelper, awsClients []aws.Clie
 		Collector:         h.Collector,
 		AppliedCapacity:   nil,
 		StepStatus:        helper.InitStartStatus(),
+		HealthCheckStatus: map[string]bool{},
 	}
 }
 
@@ -596,6 +598,7 @@ func (d *Deployer) Deploy(config schemas.Config, region schemas.RegionConfig) er
 	launchTemplateTags := d.GenerateLaunchTemplateTags(newAsgName, d.Stack.Stack, config.ExtraTags, region.Region)
 
 	blockDevices := client.EC2Service.MakeLaunchTemplateBlockDeviceMappings(d.Stack.BlockDevices)
+
 	d.Logger.Debugf("additional blokcDevice information %s", blockDevices)
 
 	ebsOptimized := d.Stack.EbsOptimized
@@ -615,7 +618,7 @@ func (d *Deployer) Deploy(config schemas.Config, region schemas.RegionConfig) er
 	if len(securityGroups) > 0 && (region.PrimaryENI != nil || len(region.SecondaryENIs) > 0) {
 		return fmt.Errorf("cannot use both launch template security groups and ENI security groups at the same time")
 	}
-
+	d.Logger.Debugf("Block Device Len %d", len(blockDevices))
 	err = client.EC2Service.CreateNewLaunchTemplate(
 		launchTemplateName,
 		ami,
@@ -1021,12 +1024,15 @@ func (d *Deployer) HealthChecking(config schemas.Config) (bool, error) {
 		}
 
 		if isHealthy {
+			d.HealthCheckStatus[region.Region] = true
 			if d.Collector.MetricConfig.Enabled {
 				if err := d.Collector.UpdateStatus(*asg.AutoScalingGroupName, "deployed", nil); err != nil {
 					d.Logger.Errorf("Update status Error, %s : %s", err.Error(), *asg.AutoScalingGroupName)
 				}
 			}
 			finished = append(finished, region.Region)
+		} else {
+			d.HealthCheckStatus[region.Region] = false
 		}
 	}
 
@@ -1147,6 +1153,13 @@ func (d *Deployer) CleanPreviousAutoScalingGroup(config schemas.Config) error {
 			continue
 		}
 
+		// Check if health check passed for this region
+		if healthStatus, exists := d.HealthCheckStatus[region.Region]; exists && !healthStatus {
+			d.Logger.Warnf("[%s] Skipping cleanup of previous ASGs due to failed health check", region.Region)
+			d.Slack.SendSimpleMessage(fmt.Sprintf(":warning: Skipping cleanup of previous ASGs in %s due to failed health check", region.Region))
+			continue
+		}
+
 		d.Logger.Infof("[%s]The number of previous versions to delete is %d", region.Region, len(d.PrevAsgs[region.Region]))
 
 		// select client

pkg/deployer/deployer_test.go

@@ -88,3 +88,28 @@ func TestDeployer_ValidateOption(t *testing.T) {
 		t.Errorf("Invalid Override Spot Types Option: %s", validErr)
 	}
 }
+
+func TestDeployer_HealthCheckingStatus(t *testing.T) {
+	deployer := Deployer{
+		HealthCheckStatus: make(map[string]bool),
+		StepStatus:        map[int64]bool{constants.StepDeploy: true},
+		Stack: schemas.Stack{
+			Regions: []schemas.RegionConfig{
+				{Region: "ap-northeast-2"},
+			},
+		},
+	}
+
+	// Initially, health check status should be false or not set
+	if status, exists := deployer.HealthCheckStatus["ap-northeast-2"]; exists && status {
+		t.Error("HealthCheckStatus should not be true initially")
+	}
+
+	// Simulate successful health check by setting the status
+	deployer.HealthCheckStatus["ap-northeast-2"] = true
+
+	// Verify that the status is now true
+	if !deployer.HealthCheckStatus["ap-northeast-2"] {
+		t.Error("HealthCheckStatus should be true after successful health check")
+	}
+}

pkg/sumdb/sum.golang.org/latest

@@ -0,0 +1,5 @@
+go.sum database tree
+43279701
+Um2aeKGAneeDXP1z1W4ltGD2tkI7jyD5f7tdq71kyuY=
+
+— sum.golang.org Az3grgUju0c9GRK4rchalgvdwabWuqx1vJc2cdPRk58Seb1AqAEpfwzNtdDPJzKRKzokjOdVXUxLdKQ5VmioyPvKHQo=