Fix all silly mistakes

README.md

@@ -15,6 +15,7 @@ The currently supported functionality includes:
 * Deleting all Elastic IPs in an AWS account
 * Deleting all Launch Configurations in an AWS account
 * Deleting all ECS services in an AWS account
+* Deleting all EKS clusters in an AWS account
 
 ### Caveats
 

aws/aws.go

@@ -222,6 +222,18 @@ func GetAllResources(regions []string, excludedRegions []string, excludeAfter ti
 		resourcesInRegion.Resources = append(resourcesInRegion.Resources, ecsServices)
 		// End ECS resources
 
+		// EKS resources
+		eksClusterNames, err := getAllEksClusters(session, excludeAfter)
+		if err != nil {
+			return nil, errors.WithStackTrace(err)
+		}
+
+		eksClusters := EKSClusters{
+			Clusters: awsgo.StringValueSlice(eksClusterNames),
+		}
+		resourcesInRegion.Resources = append(resourcesInRegion.Resources, eksClusters)
+		// End EKS resources
+
 		account.Resources[region] = resourcesInRegion
 	}
 

aws/eks_test.go

@@ -7,7 +7,6 @@ import (
 	awsgo "github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/gruntwork-io/cloud-nuke/util"
-	"github.com/gruntwork-io/gruntwork-cli/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -17,13 +16,11 @@ import (
 func TestListEksClusters(t *testing.T) {
 	t.Parallel()
 
-	region := getRandomEksSupportedRegion()
+	region := getRandomEksSupportedRegion(t)
 	awsSession, err := session.NewSession(&awsgo.Config{
 		Region: awsgo.String(region),
 	})
-	if err != nil {
-		require.Fail(t, errors.WithStackTrace(err).Error())
-	}
+	require.NoError(t, err)
 
 	uniqueID := util.UniqueID()
 
@@ -51,13 +48,11 @@ func TestListEksClusters(t *testing.T) {
 func TestNukeEksClusters(t *testing.T) {
 	t.Parallel()
 
-	region := getRandomEksSupportedRegion()
+	region := getRandomEksSupportedRegion(t)
 	awsSession, err := session.NewSession(&awsgo.Config{
 		Region: awsgo.String(region),
 	})
-	if err != nil {
-		assert.Fail(t, errors.WithStackTrace(err).Error())
-	}
+	require.NoError(t, err)
 
 	uniqueID := util.UniqueID()
 
@@ -66,13 +61,9 @@ func TestNukeEksClusters(t *testing.T) {
 
 	cluster := createEksCluster(t, awsSession, uniqueID, *role.Arn)
 	err = nukeAllEksClusters(awsSession, []*string{cluster.Name})
-	if err != nil {
-		assert.Fail(t, err.Error())
-	}
+	require.NoError(t, err)
 
 	eksClusterNames, err := getAllEksClusters(awsSession, time.Now().Add(1*time.Hour))
-	if err != nil {
-		assert.Failf(t, "Unable to fetch list of clusters: %s", err.Error())
-	}
+	require.NoError(t, err)
 	assert.NotContains(t, awsgo.StringValueSlice(eksClusterNames), *cluster.Name)
 }

aws/eks_types.go

@@ -0,0 +1,34 @@
+package aws
+
+import (
+	awsgo "github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/gruntwork-io/gruntwork-cli/errors"
+)
+
+// EKSClusters - Represents all EKS clusters found in a region
+type EKSClusters struct {
+	Clusters []string
+}
+
+// ResourceName - The simple name of the aws resource
+func (clusters EKSClusters) ResourceName() string {
+	return "ekscluster"
+}
+
+// ResourceIdentifiers - The Name of the collected EKS clusters
+func (clusters EKSClusters) ResourceIdentifiers() []string {
+	return clusters.Clusters
+}
+
+func (clusters EKSClusters) MaxBatchSize() int {
+	return 200
+}
+
+// Nuke - nuke all EKS Cluster resources
+func (clusters EKSClusters) Nuke(awsSession *session.Session, identifiers []string) error {
+	if err := nukeAllEksClusters(awsSession, awsgo.StringSlice(identifiers)); err != nil {
+		return errors.WithStackTrace(err)
+	}
+	return nil
+}

aws/eks_utils_for_test.go

@@ -2,7 +2,6 @@ package aws
 
 import (
 	"fmt"
-	"math/rand"
 	"testing"
 	"time"
 
@@ -11,22 +10,17 @@ import (
 	"github.com/aws/aws-sdk-go/service/eks"
 	"github.com/aws/aws-sdk-go/service/iam"
 	gruntworkerrors "github.com/gruntwork-io/gruntwork-cli/errors"
+	terraAws "github.com/gruntwork-io/terratest/modules/aws"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 // getRandomEksSupportedRegion - Returns a random AWS region that supports EKS.
 // Refer to https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/
-func getRandomEksSupportedRegion() string {
-	supportedRegions := []string{
-		"us-east-1",
-		"us-east-2",
-		"us-west-2",
-		"eu-west-1",
-	}
-	rand.Seed(time.Now().UnixNano())
-	randIndex := rand.Intn(len(supportedRegions))
-	return supportedRegions[randIndex]
+func getRandomEksSupportedRegion(t *testing.T) string {
+	// Approve only regions where EKS and the EKS optimized Linux AMI are available
+	approvedRegions := []string{"us-west-2", "us-east-1", "us-east-2", "eu-west-1"}
+	return terraAws.GetRandomRegion(t, approvedRegions, []string{})
 }
 
 func createEksCluster(