Merge pull request #62 from marcboudreau/fixing-panic-in-ec2info

Fixing a panic in Ec2Info.go
hairyhenderson · Sep 6, 2016 · f0f19cd · f0f19cd
2 parents 210b6ab + bbe1a83
commit f0f19cd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/aws/ec2info.go b/aws/ec2info.go
@@ -20,7 +20,7 @@ type InstanceDescriber interface {
 
 // NewEc2Info -
 func NewEc2Info() *Ec2Info {
-	metaClient := &Ec2Meta{}
+	metaClient := NewEc2Meta()
 	return &Ec2Info{
 		describer: func() InstanceDescriber {
 			region := metaClient.Region()

diff --git a/aws/ec2info_test.go b/aws/ec2info_test.go
@@ -98,3 +98,28 @@ func TestTag_NonEC2(t *testing.T) {
 	assert.Equal(t, "", e.Tag("foo"))
 	assert.Equal(t, "default", e.Tag("foo", "default"))
 }
+
+func TestNewEc2Info(t *testing.T) {
+	server, ec2meta := MockServer(200, `"i-1234"`)
+	defer server.Close()
+	client := DummyInstanceDescriber{
+		tags: []*ec2.Tag{
+			&ec2.Tag{
+				Key:   aws.String("foo"),
+				Value: aws.String("bar"),
+			},
+			&ec2.Tag{
+				Key:   aws.String("baz"),
+				Value: aws.String("qux"),
+			},
+		},
+	}
+	e := NewEc2Info()
+	e.describer = func() InstanceDescriber {
+		return client
+	}
+	e.metaClient = ec2meta
+
+	assert.Equal(t, "bar", e.Tag("foo"))
+	assert.Equal(t, "bar", e.Tag("foo", "default"))
+}