aws/ec2metadata: Add marketplaceProductCodes to Instance Identity Document (#374)

Adds MarketplaceProductCodes to the EC2 Instance Metadata's Identity Document. The ec2metadata client will now retrieve these values if they are available.

Related to: aws/aws-sdk-go#2781

Author: diehlaws

CHANGELOG_PENDING.md

@@ -7,9 +7,12 @@
 * `private/protocol`: Add support for parsing fractional timestamp ([#367](https://github.com/aws/aws-sdk-go-v2/pull/367))
   * Fixes the SDK's ability to parse fractional unix timestamp values and adds tests.
   * Fixes [#365](https://github.com/aws/aws-sdk-go-v2/issues/365)
+* `aws/ec2metadata`: Add marketplaceProductCodes to EC2 Instance Identity Document
+  * Adds `MarketplaceProductCodes` to the EC2 Instance Metadata's Identity Document. The ec2metadata client will now retrieve these values if they are available.
+  * Related to: [aws/aws-sdk-go#2781](https://github.com/aws/aws-sdk-go/issues/2781)
 
 ### SDK Bugs
 * `aws`: Fixes bug in calculating throttled retry delay ([#373](https://github.com/aws/aws-sdk-go/pull/373))
   * The `Retry-After` duration specified in the request is now added to the Retry delay for throttled exception. Adds test for retry delays for throttled exceptions. Fixes bug where the throttled retry's math was off.
   * Fixes [#45](https://github.com/aws/aws-sdk-go/issues/45)
-  
+

aws/ec2metadata/api_ops.go

@@ -145,20 +145,21 @@ type EC2IAMInfo struct {
 // An EC2InstanceIdentityDocument provides the shape for unmarshaling
 // an instance identity document
 type EC2InstanceIdentityDocument struct {
-	DevpayProductCodes []string  `json:"devpayProductCodes"`
-	AvailabilityZone   string    `json:"availabilityZone"`
-	PrivateIP          string    `json:"privateIp"`
-	Version            string    `json:"version"`
-	Region             string    `json:"region"`
-	InstanceID         string    `json:"instanceId"`
-	BillingProducts    []string  `json:"billingProducts"`
-	InstanceType       string    `json:"instanceType"`
-	AccountID          string    `json:"accountId"`
-	PendingTime        time.Time `json:"pendingTime"`
-	ImageID            string    `json:"imageId"`
-	KernelID           string    `json:"kernelId"`
-	RamdiskID          string    `json:"ramdiskId"`
-	Architecture       string    `json:"architecture"`
+	DevpayProductCodes      []string  `json:"devpayProductCodes"`
+	MarketplaceProductCodes []string  `json:"marketplaceProductCodes"`
+	AvailabilityZone        string    `json:"availabilityZone"`
+	PrivateIP               string    `json:"privateIp"`
+	Version                 string    `json:"version"`
+	Region                  string    `json:"region"`
+	InstanceID              string    `json:"instanceId"`
+	BillingProducts         []string  `json:"billingProducts"`
+	InstanceType            string    `json:"instanceType"`
+	AccountID               string    `json:"accountId"`
+	PendingTime             time.Time `json:"pendingTime"`
+	ImageID                 string    `json:"imageId"`
+	KernelID                string    `json:"kernelId"`
+	RamdiskID               string    `json:"ramdiskId"`
+	Architecture            string    `json:"architecture"`
 }
 
 func suffixPath(base, add string) string {

aws/ec2metadata/api_ops_test.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -19,6 +20,7 @@ import (
 
 const instanceIdentityDocument = `{
   "devpayProductCodes" : null,
+  "marketplaceProductCodes" : [ "1abc2defghijklm3nopqrs4tu" ], 
   "availabilityZone" : "us-east-1d",
   "privateIp" : "10.158.112.84",
   "version" : "2010-08-31",
@@ -338,4 +340,8 @@ func TestEC2RoleProviderInstanceIdentity(t *testing.T) {
 	if e, a := doc.Region, "us-east-1"; e != a {
 		t.Errorf("expect %v, got %v", e, a)
 	}
+	expectProductCodes := []string{"1abc2defghijklm3nopqrs4tu"}
+	if e, a := expectProductCodes, doc.MarketplaceProductCodes; !reflect.DeepEqual(e, a) {
+		t.Errorf("Expect %v product codes, got %v", e, a)
+	}
 }