Skip to content

Commit e066626

Browse files
author
awstools
committed
feat(client-license-manager): Add Tagging feature to resources in the Managed Entitlements service. License and Grant resources can now be tagged.
1 parent b33a073 commit e066626

File tree

9 files changed

+138
-54
lines changed

9 files changed

+138
-54
lines changed

‎clients/client-license-manager/src/commands/CreateGrantCommand.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ export interface CreateGrantCommandOutput extends CreateGrantResponse, __Metadat
4848
* AllowedOperations: [ // AllowedOperationList // required
4949
* "CreateGrant" || "CheckoutLicense" || "CheckoutBorrowLicense" || "CheckInLicense" || "ExtendConsumptionLicense" || "ListPurchasedLicenses" || "CreateToken",
5050
* ],
51+
* Tags: [ // TagList
52+
* { // Tag
53+
* Key: "STRING_VALUE",
54+
* Value: "STRING_VALUE",
55+
* },
56+
* ],
5157
* };
5258
* const command = new CreateGrantCommand(input);
5359
* const response = await client.send(command);

‎clients/client-license-manager/src/commands/CreateLicenseCommand.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ export interface CreateLicenseCommandOutput extends CreateLicenseResponse, __Met
7676
* },
7777
* ],
7878
* ClientToken: "STRING_VALUE", // required
79+
* Tags: [ // TagList
80+
* { // Tag
81+
* Key: "STRING_VALUE",
82+
* Value: "STRING_VALUE",
83+
* },
84+
* ],
7985
* };
8086
* const command = new CreateLicenseCommand(input);
8187
* const response = await client.send(command);

‎clients/client-license-manager/src/commands/ListTagsForResourceCommand.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ export interface ListTagsForResourceCommandInput extends ListTagsForResourceRequ
2828
export interface ListTagsForResourceCommandOutput extends ListTagsForResourceResponse, __MetadataBearer {}
2929

3030
/**
31-
* <p>Lists the tags for the specified license configuration.</p>
31+
* <p>Lists the tags for the specified resource. For more information about tagging support in
32+
* License Manager, see the <a href="https://docs.aws.amazon.com/license-manager/latest/APIReference/API_TagResource.html">TagResource</a> operation.</p>
3233
* @example
3334
* Use a bare-bones client and the command you need to make an API call.
3435
* ```javascript

‎clients/client-license-manager/src/commands/TagResourceCommand.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,22 @@ export interface TagResourceCommandInput extends TagResourceRequest {}
2828
export interface TagResourceCommandOutput extends TagResourceResponse, __MetadataBearer {}
2929

3030
/**
31-
* <p>Adds the specified tags to the specified license configuration.</p>
31+
* <p>Adds the specified tags to the specified resource. The following resources support
32+
* tagging in License Manager:</p>
33+
* <ul>
34+
* <li>
35+
* <p>Licenses</p>
36+
* </li>
37+
* <li>
38+
* <p>Grants</p>
39+
* </li>
40+
* <li>
41+
* <p>License configurations</p>
42+
* </li>
43+
* <li>
44+
* <p>Report generators</p>
45+
* </li>
46+
* </ul>
3247
* @example
3348
* Use a bare-bones client and the command you need to make an API call.
3449
* ```javascript

‎clients/client-license-manager/src/commands/UntagResourceCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface UntagResourceCommandInput extends UntagResourceRequest {}
2828
export interface UntagResourceCommandOutput extends UntagResourceResponse, __MetadataBearer {}
2929

3030
/**
31-
* <p>Removes the specified tags from the specified license configuration.</p>
31+
* <p>Removes the specified tags from the specified resource.</p>
3232
* @example
3333
* Use a bare-bones client and the command you need to make an API call.
3434
* ```javascript

‎clients/client-license-manager/src/commands/UpdateLicenseConfigurationCommand.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ export interface UpdateLicenseConfigurationCommandOutput extends UpdateLicenseCo
8080
* <p>The Amazon Web Services user account does not have permission to perform the action. Check the IAM
8181
* policy associated with this account.</p>
8282
*
83+
* @throws {@link ConflictException} (client fault)
84+
* <p>There was a conflict processing the request. Try your request again.</p>
85+
*
8386
* @throws {@link InvalidParameterValueException} (client fault)
8487
* <p>One or more parameter values are not valid.</p>
8588
*

‎clients/client-license-manager/src/commands/UpdateLicenseSpecificationsForResourceCommand.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ export interface UpdateLicenseSpecificationsForResourceCommandOutput
8181
* <p>The Amazon Web Services user account does not have permission to perform the action. Check the IAM
8282
* policy associated with this account.</p>
8383
*
84+
* @throws {@link ConflictException} (client fault)
85+
* <p>There was a conflict processing the request. Try your request again.</p>
86+
*
8487
* @throws {@link InvalidParameterValueException} (client fault)
8588
* <p>One or more parameter values are not valid.</p>
8689
*

‎clients/client-license-manager/src/models/models_0.ts

Lines changed: 68 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,25 @@ export interface CheckoutLicenseResponse {
717717
LicenseArn?: string | undefined;
718718
}
719719

720+
/**
721+
* <p>Details about the tags for a resource. For more information about tagging support in
722+
* License Manager, see the <a href="https://docs.aws.amazon.com/license-manager/latest/APIReference/API_TagResource.html">TagResource</a> operation.</p>
723+
* @public
724+
*/
725+
export interface Tag {
726+
/**
727+
* <p>The tag key.</p>
728+
* @public
729+
*/
730+
Key?: string | undefined;
731+
732+
/**
733+
* <p>The tag value.</p>
734+
* @public
735+
*/
736+
Value?: string | undefined;
737+
}
738+
720739
/**
721740
* @public
722741
*/
@@ -772,6 +791,13 @@ export interface CreateGrantRequest {
772791
* @public
773792
*/
774793
AllowedOperations: AllowedOperation[] | undefined;
794+
795+
/**
796+
* <p>Tags to add to the grant. For more information about tagging support in
797+
* License Manager, see the <a href="https://docs.aws.amazon.com/license-manager/latest/APIReference/API_TagResource.html">TagResource</a> operation.</p>
798+
* @public
799+
*/
800+
Tags?: Tag[] | undefined;
775801
}
776802

777803
/**
@@ -1175,6 +1201,13 @@ export interface CreateLicenseRequest {
11751201
* @public
11761202
*/
11771203
ClientToken: string | undefined;
1204+
1205+
/**
1206+
* <p>Tags to add to the license. For more information about tagging support in
1207+
* License Manager, see the <a href="https://docs.aws.amazon.com/license-manager/latest/APIReference/API_TagResource.html">TagResource</a> operation.</p>
1208+
* @public
1209+
*/
1210+
Tags?: Tag[] | undefined;
11781211
}
11791212

11801213
/**
@@ -1328,7 +1361,8 @@ export interface ProductInformation {
13281361
* <p>
13291362
* <code>Engine Edition</code> - The edition of the database engine.
13301363
* Logical operator is <code>EQUALS</code>.
1331-
* Possible values are: <code>oracle-ee</code> | <code>oracle-se</code> | <code>oracle-se1</code> | <code>oracle-se2</code>.</p>
1364+
* Possible values are: <code>oracle-ee</code> | <code>oracle-se</code> | <code>oracle-se1</code> | <code>oracle-se2</code>
1365+
* | <code>db2-se</code> | <code>db2-ae</code>.</p>
13321366
* </li>
13331367
* <li>
13341368
* <p>
@@ -1346,24 +1380,6 @@ export interface ProductInformation {
13461380
ProductInformationFilterList: ProductInformationFilter[] | undefined;
13471381
}
13481382

1349-
/**
1350-
* <p>Details about a tag for a license configuration.</p>
1351-
* @public
1352-
*/
1353-
export interface Tag {
1354-
/**
1355-
* <p>Tag key.</p>
1356-
* @public
1357-
*/
1358-
Key?: string | undefined;
1359-
1360-
/**
1361-
* <p>Tag value.</p>
1362-
* @public
1363-
*/
1364-
Value?: string | undefined;
1365-
}
1366-
13671383
/**
13681384
* @public
13691385
*/
@@ -1413,8 +1429,6 @@ export interface CreateLicenseConfigurationRequest {
14131429
* <li>
14141430
* <p>
14151431
* <code>Instances</code> dimension: <code>allowedTenancy</code> |
1416-
* <code>maximumCores</code> | <code>minimumCores</code> |
1417-
* <code>maximumSockets</code> | <code>minimumSockets</code> |
14181432
* <code>maximumVcpus</code> | <code>minimumVcpus</code>
14191433
* </p>
14201434
* </li>
@@ -3084,18 +3098,15 @@ export interface ListLicenseConfigurationsRequest {
30843098
* <li>
30853099
* <p>
30863100
* <code>licenseCountingType</code> - The dimension for which licenses are counted.
3087-
* Possible values are <code>vCPU</code> | <code>Instance</code> | <code>Core</code> | <code>Socket</code>.
3088-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
3101+
* Possible values are <code>vCPU</code> | <code>Instance</code> | <code>Core</code> | <code>Socket</code>.</p>
30893102
* </li>
30903103
* <li>
30913104
* <p>
3092-
* <code>enforceLicenseCount</code> - A Boolean value that indicates whether hard license enforcement is used.
3093-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
3105+
* <code>enforceLicenseCount</code> - A Boolean value that indicates whether hard license enforcement is used.</p>
30943106
* </li>
30953107
* <li>
30963108
* <p>
3097-
* <code>usagelimitExceeded</code> - A Boolean value that indicates whether the available licenses have been exceeded.
3098-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
3109+
* <code>usagelimitExceeded</code> - A Boolean value that indicates whether the available licenses have been exceeded.</p>
30993110
* </li>
31003111
* </ul>
31013112
* @public
@@ -4127,7 +4138,7 @@ export interface ListResourceInventoryResponse {
41274138
*/
41284139
export interface ListTagsForResourceRequest {
41294140
/**
4130-
* <p>Amazon Resource Name (ARN) of the license configuration.</p>
4141+
* <p>Amazon Resource Name (ARN) of the resource.</p>
41314142
* @public
41324143
*/
41334144
ResourceArn: string | undefined;
@@ -4273,18 +4284,16 @@ export interface ListUsageForLicenseConfigurationRequest {
42734284
* <ul>
42744285
* <li>
42754286
* <p>
4276-
* <code>resourceArn</code> - The ARN of the license configuration resource.
4277-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
4287+
* <code>resourceArn</code> - The ARN of the license configuration resource.</p>
42784288
* </li>
42794289
* <li>
42804290
* <p>
4281-
* <code>resourceType</code> - The resource type (<code>EC2_INSTANCE</code> | <code>EC2_HOST</code> | <code>EC2_AMI</code> | <code>SYSTEMS_MANAGER_MANAGED_INSTANCE</code>).
4282-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
4291+
* <code>resourceType</code> - The resource type (<code>EC2_INSTANCE</code> |
4292+
* <code>EC2_HOST</code> | <code>EC2_AMI</code> | <code>SYSTEMS_MANAGER_MANAGED_INSTANCE</code>).</p>
42834293
* </li>
42844294
* <li>
42854295
* <p>
4286-
* <code>resourceAccount</code> - The ID of the account that owns the resource.
4287-
* Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p>
4296+
* <code>resourceAccount</code> - The ID of the account that owns the resource.</p>
42884297
* </li>
42894298
* </ul>
42904299
* @public
@@ -4390,7 +4399,30 @@ export interface RejectGrantResponse {
43904399
*/
43914400
export interface TagResourceRequest {
43924401
/**
4393-
* <p>Amazon Resource Name (ARN) of the license configuration.</p>
4402+
* <p>Amazon Resource Name (ARN) of the resource. The following examples provide an example
4403+
* ARN for each supported resource in License Manager:</p>
4404+
* <ul>
4405+
* <li>
4406+
* <p>Licenses -
4407+
* <code>arn:aws:license-manager::111122223333:license:l-EXAMPLE2da7646d6861033667f20e895</code>
4408+
* </p>
4409+
* </li>
4410+
* <li>
4411+
* <p>Grants -
4412+
* <code>arn:aws:license-manager::111122223333:grant:g-EXAMPLE7b19f4a0ab73679b0beb52707</code>
4413+
* </p>
4414+
* </li>
4415+
* <li>
4416+
* <p>License configurations -
4417+
* <code>arn:aws:license-manager:us-east-1:111122223333:license-configuration:lic-EXAMPLE6a788d4c8acd4264ff0ecf2ed2d</code>
4418+
* </p>
4419+
* </li>
4420+
* <li>
4421+
* <p>Report generators -
4422+
* <code>arn:aws:license-manager:us-east-1:111122223333:report-generator:r-EXAMPLE825b4a4f8fe5a3e0c88824e5fc6</code>
4423+
* </p>
4424+
* </li>
4425+
* </ul>
43944426
* @public
43954427
*/
43964428
ResourceArn: string | undefined;
@@ -4412,7 +4444,7 @@ export interface TagResourceResponse {}
44124444
*/
44134445
export interface UntagResourceRequest {
44144446
/**
4415-
* <p>Amazon Resource Name (ARN) of the license configuration.</p>
4447+
* <p>Amazon Resource Name (ARN) of the resource.</p>
44164448
* @public
44174449
*/
44184450
ResourceArn: string | undefined;

0 commit comments

Comments
 (0)