Wait after terminating EC2 instances

kylos101 · kylos101 · commit fdc3c34bbbdd · 2024-07-17T13:13:09.000Z
This way, we stop using NICs, before attempting to delete security groups, after cleaning up when diagnosing.
diff --git a/gitpod-network-check/cmd/common.go b/gitpod-network-check/cmd/common.go
@@ -64,9 +64,6 @@ func cleanup(ctx context.Context, svc *ec2.Client, iamsvc *iam.Client) {
 	}
 
 	if len(InstanceIds) > 0 {
-		log.Info("Cleaning up: Waiting for 2 minutes so network interfaces are deleted")
-		time.Sleep(2 * time.Minute)
-
 		_, err := svc.TerminateInstances(ctx, &ec2.TerminateInstancesInput{
 			InstanceIds: InstanceIds,
 		})
@@ -75,6 +72,9 @@ func cleanup(ctx context.Context, svc *ec2.Client, iamsvc *iam.Client) {
 		}
 
 		log.Info("✅ Instances terminated")
+
+		log.Info("Cleaning up: Waiting for 2 minutes so network interfaces are deleted")
+		time.Sleep(2 * time.Minute)
 	}
 
 	if len(Roles) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,6 @@ func cleanup(ctx context.Context, svc ec2.Client, iamsvc iam.Client) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if len(InstanceIds) > 0 {`
`67`		`- log.Info("Cleaning up: Waiting for 2 minutes so network interfaces are deleted")`
`68`		`- time.Sleep(2 * time.Minute)`
`69`		`-`
`70`	`67`	`_, err := svc.TerminateInstances(ctx, &ec2.TerminateInstancesInput{`
`71`	`68`	`InstanceIds: InstanceIds,`
`72`	`69`	`})`
`@@ -75,6 +72,9 @@ func cleanup(ctx context.Context, svc ec2.Client, iamsvc iam.Client) {`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`log.Info("✅ Instances terminated")`
	`75`	`+`
	`76`	`+ log.Info("Cleaning up: Waiting for 2 minutes so network interfaces are deleted")`
	`77`	`+ time.Sleep(2 * time.Minute)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if len(Roles) == 0 {`