Skip to content

Commit

Permalink
fixing merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ina-stoyanova committed Oct 9, 2020
2 parents 68c8bc5 + c74dda2 commit 1c3e7fd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions aws/ecs_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func getAllEcsClustersOlderThan(awsSession *session.Session, region string, excl
}
}
}

return filteredEcsClusters, nil
}

Expand Down Expand Up @@ -125,7 +124,7 @@ func getFirstSeenEcsClusterTag(awsSession *session.Session, clusterArn *string)
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))
logging.Logger.Errorf("Error parsing the `cloud-nuke-first-seen` tag for ECS cluster with ARN %s", aws.StringValue(clusterArn))
return firstSeenTime, errors.WithStackTrace(err)
}

Expand Down

0 comments on commit 1c3e7fd

Please sign in to comment.