terminate using tags

cmd/terminate.go

@@ -20,6 +20,7 @@ import (
 	"simple-ec2/pkg/cli"
 	"simple-ec2/pkg/ec2helper"
 	"simple-ec2/pkg/question"
+	"simple-ec2/pkg/tag"
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/spf13/cobra"
@@ -29,7 +30,7 @@ import (
 var terminateCmd = &cobra.Command{
 	Use:   "terminate",
 	Short: "Terminate Amazon EC2 Instances",
-	Long:  `Terminate Amazon EC2 Instances, given the region and instance ids`,
+	Long:  `Terminate Amazon EC2 Instances, given the region and instance ids or tag values`,
 	Run:   terminate,
 }
 
@@ -42,6 +43,8 @@ func init() {
 	terminateCmd.Flags().StringSliceVarP(&instanceIdFlag, "instance-ids", "n", nil,
 		"The instance ids of the instances you want to terminate")
 	terminateCmd.Flags().BoolVarP(&isInteractive, "interactive", "i", false, "Interactive mode")
+	terminateCmd.Flags().StringToStringVar(&flagConfig.UserTags, "tags", nil,
+		"Terminate instances containing EXACT tag key-pair (Example: CreatedBy=simple-ec2)")
 }
 
 // The main function
@@ -111,20 +114,21 @@ func terminateNonInteractive(h *ec2helper.EC2Helper) {
 		instanceIdFlag[i] = strings.TrimSpace(instanceIdFlag[i])
 	}
 
-	cli.ShowError(h.TerminateInstances(instanceIdFlag), "Terminating instances failed")
+	instFilters, err := tag.GetTagAsFilter(flagConfig.UserTags)
+	instancesToTerm, err := h.GetInstancesByFilter(instanceIdFlag, instFilters)
+	if err != nil {
+		cli.ShowError(err, "Finding instances with filters failed")
+		return
+	}
+
+	cli.ShowError(h.TerminateInstances(instancesToTerm), "Terminating instances failed")
 }
 
 // Validate flags using some simple rules. Return true if the flags are validated, false otherwise
 func ValidateTerminateFlags() bool {
-	if !isInteractive && instanceIdFlag == nil && regionFlag == "" {
-		fmt.Println("Not in interactive mode and no flag is specified")
+	if !isInteractive && instanceIdFlag == nil && len(flagConfig.UserTags) == 0 {
+		fmt.Println("Specify instanceIds, tags, or use interactive mode")
 		return false
 	}
-
-	if !isInteractive && instanceIdFlag == nil {
-		fmt.Println("Not in interactive mode and instance ids are not specified")
-		return false
-	}
-
 	return true
 }

pkg/ec2helper/ec2helper.go

@@ -871,6 +871,31 @@ func (h *EC2Helper) GetInstancesByState(states []string) ([]*ec2.Instance, error
 	return instances, nil
 }
 
+func (h *EC2Helper) GetInstancesByFilter(instanceIds []string, filters []*ec2.Filter) ([]string, error) {
+	input := &ec2.DescribeInstancesInput{}
+	if len(instanceIds) > 0 {
+		input.InstanceIds = aws.StringSlice(instanceIds)
+	}
+	if len(filters) > 0 {
+		input.Filters = filters
+	}
+
+	instances, err := h.getInstances(input)
+	if err != nil {
+		return nil, err
+	}
+	if len(instances) <= 0 {
+		return nil, nil
+	}
+
+	var result []string
+	for _, instance := range instances {
+		result = append(result, *instance.InstanceId)
+	}
+
+	return result, nil
+}
+
 // Create tags for the resources specified
 func (h *EC2Helper) createTags(resources []string, tags []*ec2.Tag) error {
 	input := &ec2.CreateTagsInput{
@@ -1239,7 +1264,6 @@ func GetTagName(tags []*ec2.Tag) *string {
 			return tag.Value
 		}
 	}
-
 	return nil
 }
 

pkg/ec2helper/ec2helper_test.go

@@ -963,7 +963,7 @@ func TestGetInstanceById_Success(t *testing.T) {
 		Instances: testInstances,
 	}
 
-	instance, err := testEC2.GetInstanceById("")
+	instance, err := testEC2.GetInstanceById(testInstanceId)
 	if err != nil {
 		t.Errorf(th.UnexpectedErrorFormat, err)
 	} else if *instance.InstanceId != testInstanceId {
@@ -1014,6 +1014,75 @@ func TestGetInstancesByState_Success(t *testing.T) {
 	}
 }
 
+func TestGetInstancesByFilter_Success(t *testing.T) {
+	testTags := []*ec2.Tag{
+		{
+			Key:   aws.String("TestedBy"),
+			Value: aws.String("meh"),
+		},
+	}
+	testInstances := []*ec2.Instance{
+		{
+			InstanceId: aws.String("i-12345"),
+			Tags:       testTags,
+		},
+		{
+			InstanceId: aws.String("i-67890"),
+		},
+	}
+	testEC2.Svc = &th.MockedEC2Svc{
+		Instances: testInstances,
+	}
+
+	testFilters := []*ec2.Filter{
+		{
+			Name:   aws.String("tag:TestedBy"),
+			Values: aws.StringSlice([]string{"meh"}),
+		},
+	}
+
+	instances, err := testEC2.GetInstancesByFilter([]string{"i-12345", "i-67890"}, testFilters)
+	if err != nil {
+		t.Errorf(th.UnexpectedErrorFormat, err)
+	}
+	if len(instances) != 1 {
+		t.Error("Incorrect instance(s) returned after filtering")
+		fmt.Printf("instances: %v\n", instances)
+	} else {
+		if instances[0] != "i-12345" {
+			t.Error("Incorrect instance(s) returned after filtering")
+		}
+	}
+}
+
+func TestGetInstancesByFilter_NoResults(t *testing.T) {
+	testInstances := []*ec2.Instance{
+		{
+			InstanceId: aws.String("i-12345"),
+		},
+		{
+			InstanceId: aws.String("i-67890"),
+		},
+	}
+	testEC2.Svc = &th.MockedEC2Svc{
+		Instances: testInstances,
+	}
+
+	testFilters := []*ec2.Filter{
+		{
+			Name:   aws.String("tag:TestedBy"),
+			Values: aws.StringSlice([]string{"meh"}),
+		},
+	}
+
+	instances, err := testEC2.GetInstancesByFilter([]string{"i-12345", "i-67890"}, testFilters)
+	if err != nil {
+		t.Errorf(th.UnexpectedErrorFormat, err)
+	} else if len(instances) != 0 {
+		t.Error("Instances should NOT have been returned after filtering")
+	}
+}
+
 func TestGetInstancesByState_DescribeInstancesPagesError(t *testing.T) {
 	testEC2.Svc = &th.MockedEC2Svc{
 		DescribeInstancesPagesError: errors.New("Test error"),

pkg/question/question.go

@@ -1015,7 +1015,7 @@ func AskConfirmationWithInput(simpleConfig *config.SimpleInfo, detailedConfig *c
 	if simpleConfig.BootScriptFilePath != "" {
 		data = append(data, []string{cli.ResourceBootScriptFilePath, simpleConfig.BootScriptFilePath})
 	}
-	if simpleConfig.UserTags != nil {
+	if len(simpleConfig.UserTags) != 0 {
 		var tags []string
 		for k, v := range simpleConfig.UserTags {
 			tags = append(tags, fmt.Sprintf("%s|%s", k, v))

pkg/tag/tag.go

@@ -16,6 +16,9 @@ package tag
 import (
 	"fmt"
 	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
 // Get the tags for resources created by simple-ec2
@@ -31,3 +34,14 @@ func GetSimpleEc2Tags() *map[string]string {
 	}
 	return &tags
 }
+
+// Convert tag map to Filter
+func GetTagAsFilter(userTags map[string]string) (filters []*ec2.Filter, err error) {
+	for k, v := range userTags {
+		filters = append(filters, &ec2.Filter{
+			Name:   aws.String("tag:" + k), //prepend tag: for exact matching
+			Values: aws.StringSlice([]string{v}),
+		})
+	}
+	return filters, nil
+}

pkg/tag/tag_test.go

@@ -14,11 +14,15 @@
 package tag_test
 
 import (
+	"fmt"
+	"regexp"
 	"testing"
 
 	"simple-ec2/pkg/tag"
 )
 
+const createTimeRegex = "^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2} [0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2} [A-Z]{3}"
+
 func TestGetTags(t *testing.T) {
 	tags := tag.GetSimpleEc2Tags()
 
@@ -27,8 +31,38 @@ func TestGetTags(t *testing.T) {
 		t.Error("CreatedBy tag is not created correctly")
 	}
 
-	_, found = (*tags)["CreatedTime"]
+	createdTime, found := (*tags)["CreatedTime"]
+	matched, _ := regexp.MatchString(createTimeRegex, createdTime)
+	if !matched {
+		t.Error("CreatedTime tag was not created/formatted correctly")
+	}
 	if !found {
 		t.Error("CreatedTime tag is not created correctly")
 	}
 }
+
+func TestGetTagAsFilter(t *testing.T) {
+	tags := tag.GetSimpleEc2Tags()
+	actualTagFilter, err := tag.GetTagAsFilter(*tags)
+	if err != nil {
+		t.Error("GetTagAsFilter encountered an error: " + err.Error())
+	}
+
+	if len(actualTagFilter) != 2 {
+		t.Error("TagFilters length should be 2 but is " + fmt.Sprint(len(actualTagFilter)))
+	}
+	for _, tfilter := range actualTagFilter {
+		if *tfilter.Name != "tag:CreatedBy" && *tfilter.Name != "tag:CreatedTime" {
+			t.Error("TagFilters does not contain tag:CreatedBy or tag:CreatedTime")
+		}
+		if *tfilter.Name == "tag:CreatedBy" && *tfilter.Values[0] != "simple-ec2" {
+			t.Error("CreatedBy tag was not converted to filter correctly")
+		}
+		if *tfilter.Name == "tag:CreatedTime" {
+			matched, _ := regexp.MatchString(createTimeRegex, *tfilter.Values[0])
+			if !matched {
+				t.Error("CreatedTime tag was not converted to filter correctly")
+			}
+		}
+	}
+}

test/testhelper/ec2helper_mock.go

@@ -15,6 +15,7 @@ package testhelper
 
 import (
 	"strconv"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -303,10 +304,33 @@ func (e *MockedEC2Svc) AuthorizeSecurityGroupIngress(input *ec2.AuthorizeSecurit
 }
 
 func (e *MockedEC2Svc) DescribeInstancesPages(input *ec2.DescribeInstancesInput, fn func(*ec2.DescribeInstancesOutput, bool) bool) error {
+	var instances []*ec2.Instance
+	// mock filtering
+	for _, inst := range e.Instances {
+		addToInstances := true
+		for _, filter := range input.Filters {
+			// supports tag:<key> filter
+			if strings.Contains(*filter.Name, "tag:") {
+				tagName := strings.Split(*filter.Name, ":")[1]
+				tagVal := *filter.Values[0]
+				if len(inst.Tags) == 0 {
+					addToInstances = false
+					break
+				}
+				if *inst.Tags[0].Key != tagName || *inst.Tags[0].Value != tagVal {
+					addToInstances = false
+					break
+				}
+			}
+		}
+		if addToInstances {
+			instances = append(instances, inst)
+		}
+	}
 	output := &ec2.DescribeInstancesOutput{
 		Reservations: []*ec2.Reservation{
 			{
-				Instances: e.Instances,
+				Instances: instances,
 			},
 		},
 	}