adding methods to parse and format timestamps instead pf all across t…

…he code/test suite

aws/ecs_cluster.go

@@ -53,7 +53,7 @@ func getAllEcsClustersOlderThan(awsSession *session.Session, region string, excl
 		}
 
 		if firstSeenTime.IsZero() {
-			err := tagEcsClusterWhenFirstSeen(awsSession, clusterArn, time.Now().UTC().Format(time.RFC3339))
+			err := tagEcsClusterWhenFirstSeen(awsSession, clusterArn, formatTimestampTag(time.Now().UTC()))
 			if err != nil {
 				logging.Logger.Errorf("Error tagigng the ECS cluster with ARN %s", aws.StringValue(clusterArn))
 				return nil, errors.WithStackTrace(err)
@@ -118,7 +118,8 @@ func getClusterTag(awsSession *session.Session, clusterArn *string, tagKey strin
 	for _, tag := range clusterTags.Tags {
 		if aws.StringValue(tag.Key) == tagKey {
 
-			firstSeenTime, err := time.Parse(time.RFC3339, aws.StringValue(tag.Value))
+			firstSeenTime, err := parseTimestampTag(aws.StringValue(tag.Value))
+
 			if err != nil {
 				logging.Logger.Errorf("Error parsing the `cloud-nuke-first-seen` tag  into a `RFC3339` Time format for ECS cluster with ARN %s", aws.StringValue(clusterArn))
 				return firstSeenTime, errors.WithStackTrace(err)
@@ -129,3 +130,18 @@ func getClusterTag(awsSession *session.Session, clusterArn *string, tagKey strin
 	}
 	return firstSeenTime, nil
 }
+
+func parseTimestampTag(timestamp string) (time.Time, error) {
+	parsed, err := time.Parse(time.RFC3339, timestamp)
+
+	if err != nil {
+		logging.Logger.Errorf("Error parsing the timestamp into a `RFC3339` Time format")
+		return parsed, errors.WithStackTrace(err)
+
+	}
+	return parsed, nil
+}
+
+func formatTimestampTag(timestamp time.Time) string {
+	return timestamp.Format(time.RFC3339)
+}

aws/ecs_cluster_test.go

@@ -25,15 +25,18 @@ func TestCanTagEcsClusters(t *testing.T) {
 	cluster := createEcsFargateCluster(t, awsSession, util.UniqueID())
 	defer deleteEcsCluster(awsSession, cluster)
 
-	tagValue := time.Now().UTC().Format(time.RFC3339)
+	tagValue := formatTimestampTag(time.Now().UTC())
 
 	tagErr := tagEcsClusterWhenFirstSeen(awsSession, cluster.ClusterArn, tagValue)
 	require.NoError(t, tagErr)
 
 	returnedTag, err := getClusterTag(awsSession, cluster.ClusterArn, firstSeenTagKey)
 	require.NoError(t, err)
 
-	assert.Equal(t, returnedTag.Format(time.RFC3339), tagValue)
+	parsedOriginalTagValue, parseErr := parseTimestampTag(tagValue)
+	require.NoError(t, parseErr)
+
+	assert.Equal(t, parsedOriginalTagValue, returnedTag)
 }
 
 // Test we can get all ECS clusters younger than < X time based on tags