Skip to content

Commit 58ace8e

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
This release enhances the GetEntitlements API to support new filter CUSTOMER_AWS_ACCOUNT_ID in request and CustomerAWSAccountId field in response.
1 parent 86eb848 commit 58ace8e

14 files changed

+174
-17
lines changed

‎generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.api.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"signatureVersion":"v4",
1212
"signingName":"aws-marketplace",
1313
"targetPrefix":"AWSMPEntitlementService",
14-
"uid":"entitlement.marketplace-2017-01-11"
14+
"uid":"entitlement.marketplace-2017-01-11",
15+
"auth":["aws.auth#sigv4"]
1516
},
1617
"operations":{
1718
"GetEntitlements":{
@@ -38,6 +39,7 @@
3839
"ProductCode":{"shape":"ProductCode"},
3940
"Dimension":{"shape":"NonEmptyString"},
4041
"CustomerIdentifier":{"shape":"NonEmptyString"},
42+
"CustomerAWSAccountId":{"shape":"NonEmptyString"},
4143
"Value":{"shape":"EntitlementValue"},
4244
"ExpirationDate":{"shape":"Timestamp"}
4345
}
@@ -67,7 +69,8 @@
6769
"type":"string",
6870
"enum":[
6971
"CUSTOMER_IDENTIFIER",
70-
"DIMENSION"
72+
"DIMENSION",
73+
"CUSTOMER_AWS_ACCOUNT_ID"
7174
]
7275
},
7376
"GetEntitlementFilters":{

‎generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.docs.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "2.0",
33
"service": "<fullname>AWS Marketplace Entitlement Service</fullname> <p>This reference provides descriptions of the AWS Marketplace Entitlement Service API.</p> <p>AWS Marketplace Entitlement Service is used to determine the entitlement of a customer to a given product. An entitlement represents capacity in a product owned by the customer. For example, a customer might own some number of users or seats in an SaaS application or some amount of data capacity in a multi-tenant database.</p> <p> <b>Getting Entitlement Records</b> </p> <ul> <li> <p> <i>GetEntitlements</i>- Gets the entitlements for a Marketplace product.</p> </li> </ul>",
44
"operations": {
5-
"GetEntitlements": "<p>GetEntitlements retrieves entitlement values for a given product. The results can be filtered based on customer identifier or product dimensions.</p>"
5+
"GetEntitlements": "<p>GetEntitlements retrieves entitlement values for a given product. The results can be filtered based on customer identifier, AWS account ID, or product dimensions.</p> <important> <p> The <code>CustomerIdentifier</code> parameter is on path for deprecation. Use <code>CustomerAWSAccountID</code> instead.</p> <p>These parameters are mutually exclusive. You can't specify both <code>CustomerIdentifier</code> and <code>CustomerAWSAccountID</code> in the same request. </p> </important>"
66
},
77
"shapes": {
88
"Boolean": {
@@ -64,7 +64,7 @@
6464
"GetEntitlementFilters": {
6565
"base": null,
6666
"refs": {
67-
"GetEntitlementsRequest$Filter": "<p>Filter is used to return entitlements for a specific customer or for a specific dimension. Filters are described as keys mapped to a lists of values. Filtered requests are <i>unioned</i> for each value in the value list, and then <i>intersected</i> for each filter key.</p>"
67+
"GetEntitlementsRequest$Filter": "<p>Filter is used to return entitlements for a specific customer or for a specific dimension. Filters are described as keys mapped to a lists of values. Filtered requests are <i>unioned</i> for each value in the value list, and then <i>intersected</i> for each filter key.</p> <p> <code>CustomerIdentifier</code> and <code>CustomerAWSAccountID</code> are mutually exclusive. You can't specify both in the same request. </p>"
6868
}
6969
},
7070
"GetEntitlementsRequest": {
@@ -98,6 +98,7 @@
9898
"refs": {
9999
"Entitlement$Dimension": "<p>The dimension for which the given entitlement applies. Dimensions represent categories of capacity in a product and are specified when the product is listed in AWS Marketplace.</p>",
100100
"Entitlement$CustomerIdentifier": "<p>The customer identifier is a handle to each unique customer in an application. Customer identifiers are obtained through the ResolveCustomer operation in AWS Marketplace Metering Service.</p>",
101+
"Entitlement$CustomerAWSAccountId": "<p> The <code>CustomerAWSAccountID</code> parameter specifies the AWS account ID of the buyer. </p>",
101102
"GetEntitlementsRequest$NextToken": "<p>For paginated calls to GetEntitlements, pass the NextToken from the previous GetEntitlementsResult.</p>",
102103
"GetEntitlementsResult$NextToken": "<p>For paginated results, use NextToken in subsequent calls to GetEntitlements. If the result contains an empty set of entitlements, NextToken might still be present and should be used.</p>"
103104
}

‎generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.normal.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"signatureVersion":"v4",
1212
"signingName":"aws-marketplace",
1313
"targetPrefix":"AWSMPEntitlementService",
14-
"uid":"entitlement.marketplace-2017-01-11"
14+
"uid":"entitlement.marketplace-2017-01-11",
15+
"auth":["aws.auth#sigv4"]
1516
},
1617
"operations":{
1718
"GetEntitlements":{
@@ -27,7 +28,7 @@
2728
{"shape":"ThrottlingException"},
2829
{"shape":"InternalServiceErrorException"}
2930
],
30-
"documentation":"<p>GetEntitlements retrieves entitlement values for a given product. The results can be filtered based on customer identifier or product dimensions.</p>"
31+
"documentation":"<p>GetEntitlements retrieves entitlement values for a given product. The results can be filtered based on customer identifier, AWS account ID, or product dimensions.</p> <important> <p> The <code>CustomerIdentifier</code> parameter is on path for deprecation. Use <code>CustomerAWSAccountID</code> instead.</p> <p>These parameters are mutually exclusive. You can't specify both <code>CustomerIdentifier</code> and <code>CustomerAWSAccountID</code> in the same request. </p> </important>"
3132
}
3233
},
3334
"shapes":{
@@ -48,6 +49,10 @@
4849
"shape":"NonEmptyString",
4950
"documentation":"<p>The customer identifier is a handle to each unique customer in an application. Customer identifiers are obtained through the ResolveCustomer operation in AWS Marketplace Metering Service.</p>"
5051
},
52+
"CustomerAWSAccountId":{
53+
"shape":"NonEmptyString",
54+
"documentation":"<p> The <code>CustomerAWSAccountID</code> parameter specifies the AWS account ID of the buyer. </p>"
55+
},
5156
"Value":{
5257
"shape":"EntitlementValue",
5358
"documentation":"<p>The EntitlementValue represents the amount of capacity that the customer is entitled to for the product.</p>"
@@ -97,7 +102,8 @@
97102
"type":"string",
98103
"enum":[
99104
"CUSTOMER_IDENTIFIER",
100-
"DIMENSION"
105+
"DIMENSION",
106+
"CUSTOMER_AWS_ACCOUNT_ID"
101107
]
102108
},
103109
"GetEntitlementFilters":{
@@ -115,7 +121,7 @@
115121
},
116122
"Filter":{
117123
"shape":"GetEntitlementFilters",
118-
"documentation":"<p>Filter is used to return entitlements for a specific customer or for a specific dimension. Filters are described as keys mapped to a lists of values. Filtered requests are <i>unioned</i> for each value in the value list, and then <i>intersected</i> for each filter key.</p>"
124+
"documentation":"<p>Filter is used to return entitlements for a specific customer or for a specific dimension. Filters are described as keys mapped to a lists of values. Filtered requests are <i>unioned</i> for each value in the value list, and then <i>intersected</i> for each filter key.</p> <p> <code>CustomerIdentifier</code> and <code>CustomerAWSAccountID</code> are mutually exclusive. You can't specify both in the same request. </p>"
119125
},
120126
"NextToken":{
121127
"shape":"NonEmptyString",

‎sdk/code-analysis/ServiceAnalysis/MarketplaceEntitlementService/Generated/PropertyValueRules.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<property>Amazon.MarketplaceEntitlementService.Model.GetEntitlementsResponse.NextToken</property>
1919
<pattern>\S+</pattern>
2020
</property-value-rule>
21+
<property-value-rule>
22+
<property>Amazon.MarketplaceEntitlementService.Model.Entitlement.CustomerAWSAccountId</property>
23+
<pattern>\S+</pattern>
24+
</property-value-rule>
2125
<property-value-rule>
2226
<property>Amazon.MarketplaceEntitlementService.Model.Entitlement.CustomerIdentifier</property>
2327
<pattern>\S+</pattern>

‎sdk/src/Services/MarketplaceEntitlementService/Generated/Model/Entitlement.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,32 @@ namespace Amazon.MarketplaceEntitlementService.Model
3636
/// </summary>
3737
public partial class Entitlement
3838
{
39+
private string _customerAWSAccountId;
3940
private string _customerIdentifier;
4041
private string _dimension;
4142
private DateTime? _expirationDate;
4243
private string _productCode;
4344
private EntitlementValue _value;
4445

46+
/// <summary>
47+
/// Gets and sets the property CustomerAWSAccountId.
48+
/// <para>
49+
/// The <c>CustomerAWSAccountID</c> parameter specifies the AWS account ID of the buyer.
50+
///
51+
/// </para>
52+
/// </summary>
53+
public string CustomerAWSAccountId
54+
{
55+
get { return this._customerAWSAccountId; }
56+
set { this._customerAWSAccountId = value; }
57+
}
58+
59+
// Check to see if CustomerAWSAccountId property is set
60+
internal bool IsSetCustomerAWSAccountId()
61+
{
62+
return this._customerAWSAccountId != null;
63+
}
64+
4565
/// <summary>
4666
/// Gets and sets the property CustomerIdentifier.
4767
/// <para>

‎sdk/src/Services/MarketplaceEntitlementService/Generated/Model/GetEntitlementsRequest.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,19 @@ namespace Amazon.MarketplaceEntitlementService.Model
3232
/// <summary>
3333
/// Container for the parameters to the GetEntitlements operation.
3434
/// GetEntitlements retrieves entitlement values for a given product. The results can
35-
/// be filtered based on customer identifier or product dimensions.
35+
/// be filtered based on customer identifier, AWS account ID, or product dimensions.
36+
///
37+
/// <important>
38+
/// <para>
39+
/// The <c>CustomerIdentifier</c> parameter is on path for deprecation. Use <c>CustomerAWSAccountID</c>
40+
/// instead.
41+
/// </para>
42+
///
43+
/// <para>
44+
/// These parameters are mutually exclusive. You can't specify both <c>CustomerIdentifier</c>
45+
/// and <c>CustomerAWSAccountID</c> in the same request.
46+
/// </para>
47+
/// </important>
3648
/// </summary>
3749
public partial class GetEntitlementsRequest : AmazonMarketplaceEntitlementServiceRequest
3850
{
@@ -48,6 +60,11 @@ public partial class GetEntitlementsRequest : AmazonMarketplaceEntitlementServic
4860
/// Filters are described as keys mapped to a lists of values. Filtered requests are <i>unioned</i>
4961
/// for each value in the value list, and then <i>intersected</i> for each filter key.
5062
/// </para>
63+
///
64+
/// <para>
65+
/// <c>CustomerIdentifier</c> and <c>CustomerAWSAccountID</c> are mutually exclusive.
66+
/// You can't specify both in the same request.
67+
/// </para>
5168
/// </summary>
5269
public Dictionary<string, List<string>> Filter
5370
{

‎sdk/src/Services/MarketplaceEntitlementService/Generated/Model/Internal/MarshallTransformations/EntitlementUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public Entitlement Unmarshall(JsonUnmarshallerContext context)
6666
int targetDepth = context.CurrentDepth;
6767
while (context.ReadAtDepth(targetDepth))
6868
{
69+
if (context.TestExpression("CustomerAWSAccountId", targetDepth))
70+
{
71+
var unmarshaller = StringUnmarshaller.Instance;
72+
unmarshalledObject.CustomerAWSAccountId = unmarshaller.Unmarshall(context);
73+
continue;
74+
}
6975
if (context.TestExpression("CustomerIdentifier", targetDepth))
7076
{
7177
var unmarshaller = StringUnmarshaller.Instance;

‎sdk/src/Services/MarketplaceEntitlementService/Generated/ServiceEnumerations.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ namespace Amazon.MarketplaceEntitlementService
3030
public class GetEntitlementFilterName : ConstantClass
3131
{
3232

33+
/// <summary>
34+
/// Constant CUSTOMER_AWS_ACCOUNT_ID for GetEntitlementFilterName
35+
/// </summary>
36+
public static readonly GetEntitlementFilterName CUSTOMER_AWS_ACCOUNT_ID = new GetEntitlementFilterName("CUSTOMER_AWS_ACCOUNT_ID");
3337
/// <summary>
3438
/// Constant CUSTOMER_IDENTIFIER for GetEntitlementFilterName
3539
/// </summary>

‎sdk/src/Services/MarketplaceEntitlementService/Generated/_bcl35/AmazonMarketplaceEntitlementServiceClient.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,19 @@ protected override void Dispose(bool disposing)
287287

288288
/// <summary>
289289
/// GetEntitlements retrieves entitlement values for a given product. The results can
290-
/// be filtered based on customer identifier or product dimensions.
290+
/// be filtered based on customer identifier, AWS account ID, or product dimensions.
291+
///
292+
/// <important>
293+
/// <para>
294+
/// The <c>CustomerIdentifier</c> parameter is on path for deprecation. Use <c>CustomerAWSAccountID</c>
295+
/// instead.
296+
/// </para>
297+
///
298+
/// <para>
299+
/// These parameters are mutually exclusive. You can't specify both <c>CustomerIdentifier</c>
300+
/// and <c>CustomerAWSAccountID</c> in the same request.
301+
/// </para>
302+
/// </important>
291303
/// </summary>
292304
/// <param name="request">Container for the necessary parameters to execute the GetEntitlements service method.</param>
293305
///

‎sdk/src/Services/MarketplaceEntitlementService/Generated/_bcl35/IAmazonMarketplaceEntitlementService.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,19 @@ public partial interface IAmazonMarketplaceEntitlementService : IAmazonService,
6969

7070
/// <summary>
7171
/// GetEntitlements retrieves entitlement values for a given product. The results can
72-
/// be filtered based on customer identifier or product dimensions.
72+
/// be filtered based on customer identifier, AWS account ID, or product dimensions.
73+
///
74+
/// <important>
75+
/// <para>
76+
/// The <c>CustomerIdentifier</c> parameter is on path for deprecation. Use <c>CustomerAWSAccountID</c>
77+
/// instead.
78+
/// </para>
79+
///
80+
/// <para>
81+
/// These parameters are mutually exclusive. You can't specify both <c>CustomerIdentifier</c>
82+
/// and <c>CustomerAWSAccountID</c> in the same request.
83+
/// </para>
84+
/// </important>
7385
/// </summary>
7486
/// <param name="request">Container for the necessary parameters to execute the GetEntitlements service method.</param>
7587
///

0 commit comments

Comments
 (0)