This release enhances the BatchMeterUsage API to support new field CustomerAWSAccountId in request and response and making CustomerIdentifier optional. CustomerAWSAccountId or CustomerIdentifier must be provided in request but not both.

Author: aws-sdk-dotnet-automation

generator/ServiceModels/meteringmarketplace/meteringmarketplace-2016-01-14.api.json

@@ -5,12 +5,14 @@
     "endpointPrefix":"metering.marketplace",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"AWSMarketplace Metering",
     "serviceId":"Marketplace Metering",
     "signatureVersion":"v4",
     "signingName":"aws-marketplace",
     "targetPrefix":"AWSMPMeteringService",
-    "uid":"meteringmarketplace-2016-01-14"
+    "uid":"meteringmarketplace-2016-01-14",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "BatchMeterUsage":{
@@ -124,8 +126,8 @@
     "CustomerIdentifier":{
       "type":"string",
       "max":255,
-      "min":1,
-      "pattern":"[\\s\\S]+"
+      "min":0,
+      "pattern":"[\\s\\S]*"
     },
     "CustomerNotEntitledException":{
       "type":"structure",
@@ -378,15 +380,15 @@
       "type":"structure",
       "required":[
         "Timestamp",
-        "CustomerIdentifier",
         "Dimension"
       ],
       "members":{
         "Timestamp":{"shape":"Timestamp"},
         "CustomerIdentifier":{"shape":"CustomerIdentifier"},
         "Dimension":{"shape":"UsageDimension"},
         "Quantity":{"shape":"UsageQuantity"},
-        "UsageAllocations":{"shape":"UsageAllocations"}
+        "UsageAllocations":{"shape":"UsageAllocations"},
+        "CustomerAWSAccountId":{"shape":"CustomerAWSAccountId"}
       }
     },
     "UsageRecordList":{

generator/ServiceModels/meteringmarketplace/meteringmarketplace-2016-01-14.docs.json

@@ -54,9 +54,9 @@
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.AWSMarketplaceMetering.Model.ResolveCustomerResponse.CustomerIdentifier</property>
-    <min>1</min>
+    <min>0</min>
     <max>255</max>
-    <pattern>[\s\S]+</pattern>
+    <pattern>[\s\S]*</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.AWSMarketplaceMetering.Model.ResolveCustomerResponse.ProductCode</property>
@@ -82,10 +82,16 @@
     <max>2147483647</max>
   </property-value-rule>
   <property-value-rule>
-    <property>Amazon.AWSMarketplaceMetering.Model.UsageRecord.CustomerIdentifier</property>
+    <property>Amazon.AWSMarketplaceMetering.Model.UsageRecord.CustomerAWSAccountId</property>
     <min>1</min>
     <max>255</max>
-    <pattern>[\s\S]+</pattern>
+    <pattern>^[0-9]+$</pattern>
+  </property-value-rule>
+  <property-value-rule>
+    <property>Amazon.AWSMarketplaceMetering.Model.UsageRecord.CustomerIdentifier</property>
+    <min>0</min>
+    <max>255</max>
+    <pattern>[\s\S]*</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.AWSMarketplaceMetering.Model.UsageRecord.Dimension</property>

generator/ServiceModels/meteringmarketplace/meteringmarketplace-2016-01-14.normal.json

@@ -31,48 +31,51 @@ namespace Amazon.AWSMarketplaceMetering.Model
 {
     /// <summary>
     /// Container for the parameters to the BatchMeterUsage operation.
-    /// <c>BatchMeterUsage</c> is called from a SaaS application listed on AWS Marketplace
-    /// to post metering records for a set of customers.
-    /// 
-    ///  
+    /// <important> 
     /// <para>
-    /// For identical requests, the API is idempotent; requests can be retried with the same
-    /// records or a subset of the input records.
+    ///  The <c>CustomerIdentifier</c> parameter is scheduled for deprecation. Use <c>CustomerAWSAccountID</c>
+    /// instead.
     /// </para>
     ///  
     /// <para>
-    /// Every request to <c>BatchMeterUsage</c> is for one product. If you need to meter usage
-    /// for multiple products, you must make multiple calls to <c>BatchMeterUsage</c>.
+    /// These parameters are mutually exclusive. You can't specify both <c>CustomerIdentifier</c>
+    /// and <c>CustomerAWSAccountID</c> in the same request. 
     /// </para>
-    ///  
+    ///  </important> 
     /// <para>
-    /// Usage records are expected to be submitted as quickly as possible after the event
-    /// that is being recorded, and are not accepted more than 6 hours after the event.
+    /// To post metering records for customers, SaaS applications call <c>BatchMeterUsage</c>,
+    /// which is used for metering SaaS flexible consumption pricing (FCP). Identical requests
+    /// are idempotent and can be retried with the same records or a subset of records. Each
+    /// <c>BatchMeterUsage</c> request is for only one product. If you want to meter usage
+    /// for multiple products, you must make multiple <c>BatchMeterUsage</c> calls.
     /// </para>
     ///  
     /// <para>
-    ///  <c>BatchMeterUsage</c> can process up to 25 <c>UsageRecords</c> at a time.
+    /// Usage records should be submitted in quick succession following a recorded event.
+    /// Usage records aren't accepted 6 hours or more after an event.
     /// </para>
     ///  
     /// <para>
-    /// A <c>UsageRecord</c> can optionally include multiple usage allocations, to provide
-    /// customers with usage data split into buckets by tags that you define (or allow the
-    /// customer to define).
+    ///  <c>BatchMeterUsage</c> can process up to 25 <c>UsageRecords</c> at a time, and each
+    /// request must be less than 1 MB in size. Optionally, you can have multiple usage allocations
+    /// for usage data that's split into buckets according to predefined tags.
     /// </para>
     ///  
     /// <para>
-    ///  <c>BatchMeterUsage</c> returns a list of <c>UsageRecordResult</c> objects, showing
-    /// the result for each <c>UsageRecord</c>, as well as a list of <c>UnprocessedRecords</c>,
-    /// indicating errors in the service side that you should retry.
+    ///  <c>BatchMeterUsage</c> returns a list of <c>UsageRecordResult</c> objects, which
+    /// have each <c>UsageRecord</c>. It also returns a list of <c>UnprocessedRecords</c>,
+    /// which indicate errors on the service side that should be retried.
     /// </para>
     ///  
     /// <para>
-    ///  <c>BatchMeterUsage</c> requests must be less than 1MB in size.
+    /// For Amazon Web Services Regions that support <c>BatchMeterUsage</c>, see <a href="https://docs.aws.amazon.com/marketplace/latest/APIReference/metering-regions.html#batchmeterusage-region-support">BatchMeterUsage
+    /// Region support</a>. 
     /// </para>
     ///  <note> 
     /// <para>
-    /// For an example of using <c>BatchMeterUsage</c>, see <a href="https://docs.aws.amazon.com/marketplace/latest/userguide/saas-code-examples.html#saas-batchmeterusage-example">
-    /// BatchMeterUsage code example</a> in the <i>AWS Marketplace Seller Guide</i>.
+    /// For an example of <c>BatchMeterUsage</c>, see <a href="https://docs.aws.amazon.com/marketplace/latest/userguide/saas-code-examples.html#saas-batchmeterusage-example">
+    /// BatchMeterUsage code example</a> in the <i>Amazon Web Services Marketplace Seller
+    /// Guide</i>.
     /// </para>
     ///  </note>
     /// </summary>
@@ -84,8 +87,9 @@ public partial class BatchMeterUsageRequest : AmazonAWSMarketplaceMeteringReques
         /// <summary>
         /// Gets and sets the property ProductCode. 
         /// <para>
-        /// Product code is used to uniquely identify a product in AWS Marketplace. The product
-        /// code should be the same as the one used during the publishing of a new product.
+        /// Product code is used to uniquely identify a product in Amazon Web Services Marketplace.
+        /// The product code should be the same as the one used during the publishing of a new
+        /// product.
         /// </para>
         /// </summary>
         [AWSProperty(Required=true, Min=1, Max=255)]

sdk/code-analysis/ServiceAnalysis/AWSMarketplaceMetering/Generated/PropertyValueRules.xml

@@ -42,8 +42,8 @@ public partial class BatchMeterUsageResponse : AmazonWebServiceResponse
         /// Gets and sets the property Results. 
         /// <para>
         /// Contains all <c>UsageRecords</c> processed by <c>BatchMeterUsage</c>. These records
-        /// were either honored by AWS Marketplace Metering Service or were invalid. Invalid records
-        /// should be fixed before being resubmitted.
+        /// were either honored by Amazon Web Services Marketplace Metering Service or were invalid.
+        /// Invalid records should be fixed before being resubmitted.
         /// </para>
         /// </summary>
         public List<UsageRecordResult> Results

sdk/src/Services/AWSMarketplaceMetering/Generated/Model/BatchMeterUsageRequest.cs

@@ -48,6 +48,12 @@ public void Marshall(UsageRecord requestObject, JsonMarshallerContext context)
         {
             if(requestObject == null)
                 return;
+            if(requestObject.IsSetCustomerAWSAccountId())
+            {
+                context.Writer.WritePropertyName("CustomerAWSAccountId");
+                context.Writer.Write(requestObject.CustomerAWSAccountId);
+            }
+
             if(requestObject.IsSetCustomerIdentifier())
             {
                 context.Writer.WritePropertyName("CustomerIdentifier");

sdk/src/Services/AWSMarketplaceMetering/Generated/Model/BatchMeterUsageResponse.cs

@@ -66,6 +66,12 @@ public UsageRecord Unmarshall(JsonUnmarshallerContext context)
             int targetDepth = context.CurrentDepth;
             while (context.ReadAtDepth(targetDepth))
             {
+                if (context.TestExpression("CustomerAWSAccountId", targetDepth))
+                {
+                    var unmarshaller = StringUnmarshaller.Instance;
+                    unmarshalledObject.CustomerAWSAccountId = unmarshaller.Unmarshall(context);
+                    continue;
+                }
                 if (context.TestExpression("CustomerIdentifier", targetDepth))
                 {
                     var unmarshaller = StringUnmarshaller.Instance;

sdk/src/Services/AWSMarketplaceMetering/Generated/Model/Internal/MarshallTransformations/UsageRecordMarshaller.cs

@@ -31,7 +31,7 @@ namespace Amazon.AWSMarketplaceMetering.Model
 {
     /// <summary>
     /// An internal error has occurred. Retry your request. If the problem persists, post
-    /// a message with details on the AWS forums.
+    /// a message with details on the Amazon Web Services forums.
     /// </summary>
     #if !NETSTANDARD
     [Serializable]

sdk/src/Services/AWSMarketplaceMetering/Generated/Model/Internal/MarshallTransformations/UsageRecordUnmarshaller.cs

@@ -30,9 +30,9 @@
 namespace Amazon.AWSMarketplaceMetering.Model
 {
     /// <summary>
-    /// The endpoint being called is in a AWS Region different from your EC2 instance, ECS
-    /// task, or EKS pod. The Region of the Metering Service endpoint and the AWS Region of
-    /// the resource must match.
+    /// The endpoint being called is in a Amazon Web Services Region different from your EC2
+    /// instance, ECS task, or EKS pod. The Region of the Metering Service endpoint and the
+    /// Amazon Web Services Region of the resource must match.
     /// </summary>
     #if !NETSTANDARD
     [Serializable]