package resources

import "github.com/aws/aws-sdk-go/service/ec2"

type EC2Subnet struct {
	svc    *ec2.EC2
	id     *string
	region *string
}

func (n *EC2Nuke) ListSubnets() ([]Resource, error) {
	params := &ec2.DescribeSubnetsInput{}
	resp, err := n.Service.DescribeSubnets(params)
	if err != nil {
		return nil, err
	}

	resources := make([]Resource, 0)
	for _, out := range resp.Subnets {
		resources = append(resources, &EC2Subnet{
			svc:    n.Service,
			id:     out.SubnetId,
			region: n.Service.Config.Region,
		})
	}

	return resources, nil
}

func (e *EC2Subnet) Remove() error {
	params := &ec2.DeleteSubnetInput{
		SubnetId: e.id,
	}

	_, err := e.svc.DeleteSubnet(params)
	if err != nil {
		return err
	}

	return nil
}

func (e *EC2Subnet) String() string {
	return *e.id
}

package resources

import (
	"fmt"

	"github.com/aws/aws-sdk-go/service/ec2"
)

type EC2Subnet struct {
	svc    *ec2.EC2
	id     *string
	region *string
}

func (n *EC2Nuke) ListSubnets() ([]Resource, error) {
	params := &ec2.DescribeSubnetsInput{}
	resp, err := n.Service.DescribeSubnets(params)
	if err != nil {
		return nil, err
	}

	resources := make([]Resource, 0)
	for _, out := range resp.Subnets {
		resources = append(resources, &EC2Subnet{
			svc:    n.Service,
			id:     out.SubnetId,
			region: n.Service.Config.Region,
		})
	}

	return resources, nil
}

func (e *EC2Subnet) Remove() error {
	params := &ec2.DeleteSubnetInput{
		SubnetId: e.id,
	}

	_, err := e.svc.DeleteSubnet(params)
	if err != nil {
		return err
	}

	return nil
}

func (e *EC2Subnet) String() string {
	return fmt.Sprintf("%s in %s", *e.id, *e.region)
}

--- 
+++ 
@@ -1,10 +1,6 @@
 package resources
 
-import (
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/service/ec2"
-)
+import "github.com/aws/aws-sdk-go/service/ec2"
 
 type EC2Subnet struct {
 	svc    *ec2.EC2
@@ -45,5 +41,5 @@
 }
 
 func (e *EC2Subnet) String() string {
-	return fmt.Sprintf("%s in %s", *e.id, *e.region)
+	return *e.id
 }
Revert "fixup! CLOUD-1047: Add region to resources"

This reverts commit 05773b07489f247b989f30f866bcba77d9522ac8.
