support deleting vpcs that are non-default

aws/aws.go

@@ -642,6 +642,22 @@ func GetAllResources(targetRegions []string, excludeAfter time.Time, resourceTyp
 		}
 		// End Dynamo DB tables
 
+		// EC2 VPCS
+		ec2Vpcs := EC2VPCs{}
+		if IsNukeable(ec2Vpcs.ResourceName(), resourceTypes) {
+			vpcids, vpcs, err := getAllVpcs(session, region)
+			if err != nil {
+				return nil, errors.WithStackTrace(err)
+			}
+
+			if len(vpcids) > 0 {
+				ec2Vpcs.VPCIds = awsgo.StringValueSlice(vpcids)
+				ec2Vpcs.VPCs = vpcs
+				resourcesInRegion.Resources = append(resourcesInRegion.Resources, ec2Vpcs)
+			}
+		}
+		// End EC2 VPCS
+
 		if len(resourcesInRegion.Resources) > 0 {
 			account.Resources[region] = resourcesInRegion
 		}
@@ -717,6 +733,7 @@ func ListResourceTypes() []string {
 		CloudWatchDashboards{}.ResourceName(),
 		AccessAnalyzer{}.ResourceName(),
 		DynamoDB{}.ResourceName(),
+		EC2VPCs{}.ResourceName(),
 	}
 	sort.Strings(resourceTypes)
 	return resourceTypes

aws/ec2_types.go

@@ -34,3 +34,32 @@ func (instance EC2Instances) Nuke(session *session.Session, identifiers []string
 
 	return nil
 }
+
+type EC2VPCs struct {
+	VPCIds []string
+	VPCs   []Vpc
+}
+
+// ResourceName - the simple name of the aws resource
+func (v EC2VPCs) ResourceName() string {
+	return "vpc"
+}
+
+// ResourceIdentifiers - The instance ids of the ec2 instances
+func (v EC2VPCs) ResourceIdentifiers() []string {
+	return v.VPCIds
+}
+
+func (v EC2VPCs) MaxBatchSize() int {
+	// Tentative batch size to ensure AWS doesn't throttle
+	return 200
+}
+
+// Nuke - nuke 'em all!!!
+func (v EC2VPCs) Nuke(session *session.Session, identifiers []string) error {
+	if err := nukeAllVPCs(session, identifiers, v.VPCs); err != nil {
+		return errors.WithStackTrace(err)
+	}
+
+	return nil
+}

aws/ec2_vpc.go

@@ -0,0 +1,68 @@
+package aws
+
+import (
+	awsgo "github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/gruntwork-io/cloud-nuke/logging"
+	"github.com/gruntwork-io/go-commons/errors"
+	"github.com/hashicorp/go-multierror"
+)
+
+func getAllVpcs(session *session.Session, region string) ([]*string, []Vpc, error) {
+	svc := ec2.New(session)
+
+	result, err := svc.DescribeVpcs(&ec2.DescribeVpcsInput{
+		Filters: []*ec2.Filter{
+			// Note: this filter omits the default since there is special
+			// handling for default resources already
+			{
+				Name:   awsgo.String("is-default"),
+				Values: awsgo.StringSlice([]string{"false"}),
+			},
+		},
+	})
+	if err != nil {
+		return nil, nil, errors.WithStackTrace(err)
+	}
+
+	var ids []*string
+	var vpcs []Vpc
+	for _, vpc := range result.Vpcs {
+		ids = append(ids, vpc.VpcId)
+
+		vpcs = append(vpcs, Vpc{
+			VpcId:  *vpc.VpcId,
+			Region: region,
+			svc:    svc,
+		})
+	}
+
+	return ids, vpcs, nil
+}
+
+func nukeAllVPCs(session *session.Session, vpcIds []string, vpcs []Vpc) error {
+	if len(vpcIds) == 0 {
+		logging.Logger.Info("No VPCs to nuke")
+		return nil
+	}
+
+	logging.Logger.Info("Deleting all VPCs")
+
+	deletedVPCs := 0
+	multiErr := new(multierror.Error)
+
+	for _, vpc := range vpcs {
+		if err := vpc.nuke(); err != nil {
+			logging.Logger.Errorf("[Failed] %s", err)
+			multierror.Append(multiErr, err)
+		} else {
+			deletedVPCs++
+			logging.Logger.Infof("Deleted VPC: %s", vpc.VpcId)
+		}
+	}
+
+	logging.Logger.Infof("[OK] %d VPC terminated", deletedVPCs)
+
+	return nil
+}