Add gitpod.io/network-check tag to ec2 instances and security groups

Author: kylos101

gitpod-network-check/cmd/checks.go

@@ -302,6 +302,17 @@ func launchInstanceInSubnet(ctx context.Context, ec2Client *ec2.Client, subnetID
 		IamInstanceProfile: &types.IamInstanceProfileSpecification{
 			Arn: instanceProfileName,
 		},
+		TagSpecifications: []types.TagSpecification{
+			{
+				ResourceType: types.ResourceTypeInstance,
+				Tags: []types.Tag{
+					{
+						Key:   aws.String("gitpod.io/network-check"),
+						Value: aws.String("true"),
+					},
+				},
+			},
+		},
 	}
 
 	var result *ec2.RunInstancesOutput
@@ -440,6 +451,17 @@ func createSecurityGroups(ctx context.Context, svc *ec2.Client, subnetID string)
 		Description: aws.String("EC2 security group allowing all HTTPS outgoing traffic"),
 		GroupName:   aws.String(fmt.Sprintf("EC2-security-group-nc-%s", subnetID)),
 		VpcId:       vpcID,
+		TagSpecifications: []types.TagSpecification{
+			{
+				ResourceType: types.ResourceTypeInstance,
+				Tags: []types.Tag{
+					{
+						Key:   aws.String("gitpod.io/network-check"),
+						Value: aws.String("true"),
+					},
+				},
+			},
+		},
 	}
 
 	createSGOutput, err := svc.CreateSecurityGroup(ctx, createSGInput)

gitpod-network-check/cmd/common.go

@@ -48,10 +48,14 @@ func cleanup(ctx context.Context, svc *ec2.Client, iamsvc *iam.Client) {
 		})
 		if err != nil {
 			log.WithError(err).Warn("Failed to list instances, please cleanup manually")
+		} else if len(instances.Reservations) == 0 {
+			log.Info("No instances found.")
 		}
 
-		for _, i := range instances.Reservations[0].Instances {
-			InstanceIds = append(InstanceIds, *i.InstanceId)
+		for _, r := range instances.Reservations {
+			for _, i := range r.Instances {
+				InstanceIds = append(InstanceIds, *i.InstanceId)
+			}
 		}
 	}
 
@@ -72,6 +76,8 @@ func cleanup(ctx context.Context, svc *ec2.Client, iamsvc *iam.Client) {
 		})
 		if err != nil {
 			log.WithError(err).Warn("Failed to list roles, please cleanup manually")
+		} else if len(roles.Roles) == 0 {
+			log.Info("No roles found.")
 		}
 
 		for _, role := range roles.Roles {
@@ -139,6 +145,8 @@ func cleanup(ctx context.Context, svc *ec2.Client, iamsvc *iam.Client) {
 
 		if err != nil {
 			log.WithError(err).Error("Failed to list security groups, please cleanup manually")
+		} else if len(securityGroups.SecurityGroups) == 0 {
+			log.Info("No security groups found.")
 		}
 
 		for _, sg := range securityGroups.SecurityGroups {