Namespacing the AWS funcs

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

2 files changed, 37 insertions, 20 deletions

diff --git a/aws/ec2info_test.go b/aws/ec2info_test.go
index c99fe161..3155b9c9 100644
--- a/aws/ec2info_test.go
+++ b/aws/ec2info_test.go
@@ -8,26 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// test doubles
-type DummyInstanceDescriber struct {
-	tags []*ec2.Tag
-}
-
-func (d DummyInstanceDescriber) DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
-	output := &ec2.DescribeInstancesOutput{
-		Reservations: []*ec2.Reservation{
-			{
-				Instances: []*ec2.Instance{
-					{
-						Tags: d.tags,
-					},
-				},
-			},
-		},
-	}
-	return output, nil
-}
-
 func TestTag_MissingKey(t *testing.T) {
 	server, ec2meta := MockServer(200, `"i-1234"`)
 	defer server.Close()
diff --git a/aws/testutils.go b/aws/testutils.go
index 32c8d408..188dee7a 100644
--- a/aws/testutils.go
+++ b/aws/testutils.go
@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+
+	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
 // MockServer -
@@ -24,3 +26,38 @@ func MockServer(code int, body string) (*httptest.Server, *Ec2Meta) {
 	client := &Ec2Meta{server.URL + "/", httpClient, false, make(map[string]string)}
 	return server, client
 }
+
+// NewDummyEc2Info -
+func NewDummyEc2Info(metaClient *Ec2Meta) *Ec2Info {
+	i := &Ec2Info{
+		metaClient: metaClient,
+		describer:  func() InstanceDescriber { return DummyInstanceDescriber{} },
+	}
+	return i
+}
+
+// NewDummyEc2Meta -
+func NewDummyEc2Meta() *Ec2Meta {
+	return &Ec2Meta{nonAWS: true}
+}
+
+// DummyInstanceDescriber - test doubles
+type DummyInstanceDescriber struct {
+	tags []*ec2.Tag
+}
+
+// DescribeInstances -
+func (d DummyInstanceDescriber) DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
+	output := &ec2.DescribeInstancesOutput{
+		Reservations: []*ec2.Reservation{
+			{
+				Instances: []*ec2.Instance{
+					{
+						Tags: d.tags,
+					},
+				},
+			},
+		},
+	}
+	return output, nil
+}