aws/ec2metadata: Fix not squashing trailing slash in request path

Fixes the EC2 Instance Metadata Service client to no longer squash the
trailing slash when requesting instance metadata.

Related to aws#351

Author: jasdel

aws/ec2metadata/service_test.go renamed to aws/ec2metadata/api_client_test.go

@@ -20,6 +20,7 @@ func TestClientDisableIMDS(t *testing.T) {
 
 	cfg := unit.Config()
 	cfg.LogLevel = aws.LogDebugWithHTTPBody
+	cfg.Logger = t
 
 	svc := ec2metadata.New(cfg)
 	resp, err := svc.Region()

aws/ec2metadata/api_ops.go

@@ -19,7 +19,7 @@ func (c *Client) GetMetadata(p string) (string, error) {
 	op := &aws.Operation{
 		Name:       "GetMetadata",
 		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "meta-data", p),
+		HTTPPath:   suffixPath("/meta-data", p),
 	}
 
 	output := &metadataOutput{}
@@ -35,7 +35,7 @@ func (c *Client) GetUserData() (string, error) {
 	op := &aws.Operation{
 		Name:       "GetUserData",
 		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "user-data"),
+		HTTPPath:   "/user-data",
 	}
 
 	output := &metadataOutput{}
@@ -56,7 +56,7 @@ func (c *Client) GetDynamicData(p string) (string, error) {
 	op := &aws.Operation{
 		Name:       "GetDynamicData",
 		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "dynamic", p),
+		HTTPPath:   suffixPath("/dynamic", p),
 	}
 
 	output := &metadataOutput{}
@@ -160,3 +160,11 @@ type EC2InstanceIdentityDocument struct {
 	RamdiskID          string    `json:"ramdiskId"`
 	Architecture       string    `json:"architecture"`
 }
+
+func suffixPath(base, add string) string {
+	reqPath := path.Join(base, add)
+	if len(add) != 0 && add[len(add)-1] == '/' {
+		reqPath += "/"
+	}
+	return reqPath
+}

aws/ec2metadata/api_test.go renamed to aws/ec2metadata/api_ops_test.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"path"
 	"strings"
 	"testing"
 
@@ -68,7 +67,7 @@ func TestEndpoint(t *testing.T) {
 	op := &aws.Operation{
 		Name:       "GetMetadata",
 		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "meta-data", "testpath"),
+		HTTPPath:   "/meta-data/testpath",
 	}
 
 	req := c.NewRequest(op, nil, nil)
@@ -93,9 +92,29 @@ func TestGetMetadata(t *testing.T) {
 	c := ec2metadata.New(cfg)
 
 	resp, err := c.GetMetadata("some/path")
+	if err != nil {
+		t.Fatalf("expect no error, got %v", err)
+	}
+	if e, a := "success", resp; e != a {
+		t.Errorf("expect %v, got %v", e, a)
+	}
+}
+
+func TestGetMetadata_TrailingSlash(t *testing.T) {
+	server := initTestServer(
+		"/latest/meta-data/some/path/",
+		"success", // real response includes suffix
+	)
+	defer server.Close()
+
+	cfg := unit.Config()
+	cfg.EndpointResolver = aws.ResolveWithEndpointURL(server.URL + "/latest")
 
+	c := ec2metadata.New(cfg)
+
+	resp, err := c.GetMetadata("some/path/")
 	if err != nil {
-		t.Errorf("expect no error, got %v", err)
+		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := "success", resp; e != a {
 		t.Errorf("expect %v, got %v", e, a)
@@ -115,9 +134,8 @@ func TestGetUserData(t *testing.T) {
 	c := ec2metadata.New(cfg)
 
 	resp, err := c.GetUserData()
-
 	if err != nil {
-		t.Errorf("expect no error, got %v", err)
+		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := "success", resp; e != a {
 		t.Errorf("expect %v, got %v", e, a)
@@ -152,7 +170,7 @@ func TestGetUserData_Error(t *testing.T) {
 
 	resp, err := c.GetUserData()
 	if err == nil {
-		t.Errorf("expect error")
+		t.Fatalf("expect error")
 	}
 	if len(resp) != 0 {
 		t.Errorf("expect empty, got %v", resp)
@@ -177,9 +195,8 @@ func TestGetRegion(t *testing.T) {
 	c := ec2metadata.New(cfg)
 
 	region, err := c.Region()
-
 	if err != nil {
-		t.Errorf("expect no error, got %v", err)
+		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := "us-west-2", region; e != a {
 		t.Errorf("expect %v, got %v", e, a)
@@ -217,7 +234,7 @@ func TestMetadataIAMInfo_success(t *testing.T) {
 
 	iamInfo, err := c.IAMInfo()
 	if err != nil {
-		t.Errorf("expect no error, got %v", err)
+		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := "Success", iamInfo.Code; e != a {
 		t.Errorf("expect %v, got %v", e, a)
@@ -244,7 +261,7 @@ func TestMetadataIAMInfo_failure(t *testing.T) {
 
 	iamInfo, err := c.IAMInfo()
 	if err == nil {
-		t.Errorf("expect error")
+		t.Fatalf("expect error")
 	}
 	if e, a := "", iamInfo.Code; e != a {
 		t.Errorf("expect %v, got %v", e, a)
@@ -310,7 +327,7 @@ func TestEC2RoleProviderInstanceIdentity(t *testing.T) {
 
 	doc, err := c.GetInstanceIdentityDocument()
 	if err != nil {
-		t.Errorf("expect no error, got %v", err)
+		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := doc.AccountID, "123456789012"; e != a {
 		t.Errorf("expect %v, got %v", e, a)