updating timeMargin to be consistent and called excludeAfter; updatin…

…g test to match new condition so it passes
dxxzdxxz · Oct 7, 2020 · ca1a0cb · ca1a0cb
1 parent a2353e1
commit ca1a0cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/aws/ecs_cluster.go b/aws/ecs_cluster.go
@@ -11,6 +11,8 @@ import (
 	"github.com/gruntwork-io/gruntwork-cli/errors"
 )
 
+const firstSeenTagKey = "cloud-nuke-first-seen"
+
 // Tag an ECS cluster identified by the given cluster ARN with a tag that has the given key and value
 func tagEcsCluster(awsSession *session.Session, clusterArn *string, tagKey string, tagValue string) error {
 	svc := ecs.New(awsSession)
@@ -31,7 +33,7 @@ func tagEcsCluster(awsSession *session.Session, clusterArn *string, tagKey strin
 	return nil
 }
 
-func getAllEcsClustersOlderThan(awsSession *session.Session, region string, timeMargin time.Time) ([]*string, error) {
+func getAllEcsClustersOlderThan(awsSession *session.Session, region string, excludeAfter time.Time) ([]*string, error) {
 	awsSession, err := session.NewSession(&awsgo.Config{
 		Region: awsgo.String(region),
 	})
@@ -59,7 +61,7 @@ func getAllEcsClustersOlderThan(awsSession *session.Session, region string, time
 			}
 		}
 
-		if firstSeenTime.Before(timeMargin) {
+		if excludeAfter.After(firstSeenTime) {
 			filteredEcsClusters = append(filteredEcsClusters, clusterArn)
 		}
 	}

diff --git a/aws/ecs_cluster_test.go b/aws/ecs_cluster_test.go
@@ -86,7 +86,7 @@ func TestCanNukeAllEcsClustersOlderThan24Hours(t *testing.T) {
 	now := time.Now().UTC()
 	var oldClusterTagValue1 = now.Add(time.Hour * time.Duration(-48)).Format(time.RFC3339)
 	var youngClusterTagValue = now.Format(time.RFC3339)
-	var oldClusterTagValue2 = now.Add(time.Hour * time.Duration(-25)).Format(time.RFC3339)
+	var oldClusterTagValue2 = now.Add(time.Hour * time.Duration(-27)).Format(time.RFC3339)
 
 	tagEcsCluster(awsSession, cluster1.ClusterArn, tagKey, oldClusterTagValue1)
 	tagEcsCluster(awsSession, cluster2.ClusterArn, tagKey, youngClusterTagValue)