Skip to content

Commit 579fe8e

Browse files
AWS License Manager now supports license type conversions for AWS Marketplace products. Customers can provide Marketplace codes in the source license context or destination license context in the CreateLicenseConversionTaskForResource requests.
1 parent 2b66ed6 commit 579fe8e

13 files changed

+588
-314
lines changed

generator/ServiceModels/license-manager/license-manager-2018-08-01.api.json

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@
946946
"Arn":{
947947
"type":"string",
948948
"max":2048,
949-
"pattern":"^arn:aws(-(cn|us-gov|iso-b|iso-c|iso-d))?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$"
949+
"pattern":"^arn:aws[a-zA-Z-]*:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$"
950950
},
951951
"ArnList":{
952952
"type":"list",
@@ -990,8 +990,7 @@
990990
},
991991
"CheckInLicenseResponse":{
992992
"type":"structure",
993-
"members":{
994-
}
993+
"members":{}
995994
},
996995
"CheckoutBorrowLicenseRequest":{
997996
"type":"structure",
@@ -1353,8 +1352,7 @@
13531352
},
13541353
"DeleteLicenseConfigurationResponse":{
13551354
"type":"structure",
1356-
"members":{
1357-
}
1355+
"members":{}
13581356
},
13591357
"DeleteLicenseManagerReportGeneratorRequest":{
13601358
"type":"structure",
@@ -1365,8 +1363,7 @@
13651363
},
13661364
"DeleteLicenseManagerReportGeneratorResponse":{
13671365
"type":"structure",
1368-
"members":{
1369-
}
1366+
"members":{}
13701367
},
13711368
"DeleteLicenseRequest":{
13721369
"type":"structure",
@@ -1395,8 +1392,7 @@
13951392
},
13961393
"DeleteTokenResponse":{
13971394
"type":"structure",
1398-
"members":{
1399-
}
1395+
"members":{}
14001396
},
14011397
"DigitalSignatureMethod":{
14021398
"type":"string",
@@ -1697,8 +1693,7 @@
16971693
},
16981694
"GetServiceSettingsRequest":{
16991695
"type":"structure",
1700-
"members":{
1701-
}
1696+
"members":{}
17021697
},
17031698
"GetServiceSettingsResponse":{
17041699
"type":"structure",
@@ -1924,7 +1919,8 @@
19241919
"LicenseConversionContext":{
19251920
"type":"structure",
19261921
"members":{
1927-
"UsageOperation":{"shape":"UsageOperation"}
1922+
"UsageOperation":{"shape":"UsageOperation"},
1923+
"ProductCodes":{"shape":"ProductCodeList"}
19281924
}
19291925
},
19301926
"LicenseConversionTask":{
@@ -2360,6 +2356,29 @@
23602356
"max":1,
23612357
"min":1
23622358
},
2359+
"ProductCodeId":{
2360+
"type":"string",
2361+
"pattern":"^[A-Za-z0-9]{1,25}$"
2362+
},
2363+
"ProductCodeList":{
2364+
"type":"list",
2365+
"member":{"shape":"ProductCodeListItem"}
2366+
},
2367+
"ProductCodeListItem":{
2368+
"type":"structure",
2369+
"required":[
2370+
"ProductCodeId",
2371+
"ProductCodeType"
2372+
],
2373+
"members":{
2374+
"ProductCodeId":{"shape":"ProductCodeId"},
2375+
"ProductCodeType":{"shape":"ProductCodeType"}
2376+
}
2377+
},
2378+
"ProductCodeType":{
2379+
"type":"string",
2380+
"enum":["marketplace"]
2381+
},
23632382
"ProductInformation":{
23642383
"type":"structure",
23652384
"required":[
@@ -2613,8 +2632,7 @@
26132632
},
26142633
"TagResourceResponse":{
26152634
"type":"structure",
2616-
"members":{
2617-
}
2635+
"members":{}
26182636
},
26192637
"TokenData":{
26202638
"type":"structure",
@@ -2661,8 +2679,7 @@
26612679
},
26622680
"UntagResourceResponse":{
26632681
"type":"structure",
2664-
"members":{
2665-
}
2682+
"members":{}
26662683
},
26672684
"UpdateLicenseConfigurationRequest":{
26682685
"type":"structure",
@@ -2681,8 +2698,7 @@
26812698
},
26822699
"UpdateLicenseConfigurationResponse":{
26832700
"type":"structure",
2684-
"members":{
2685-
}
2701+
"members":{}
26862702
},
26872703
"UpdateLicenseManagerReportGeneratorRequest":{
26882704
"type":"structure",
@@ -2706,8 +2722,7 @@
27062722
},
27072723
"UpdateLicenseManagerReportGeneratorResponse":{
27082724
"type":"structure",
2709-
"members":{
2710-
}
2725+
"members":{}
27112726
},
27122727
"UpdateLicenseSpecificationsForResourceRequest":{
27132728
"type":"structure",
@@ -2720,8 +2735,7 @@
27202735
},
27212736
"UpdateLicenseSpecificationsForResourceResponse":{
27222737
"type":"structure",
2723-
"members":{
2724-
}
2738+
"members":{}
27252739
},
27262740
"UpdateServiceSettingsRequest":{
27272741
"type":"structure",
@@ -2734,8 +2748,7 @@
27342748
},
27352749
"UpdateServiceSettingsResponse":{
27362750
"type":"structure",
2737-
"members":{
2738-
}
2751+
"members":{}
27392752
},
27402753
"UsageOperation":{
27412754
"type":"string",

0 commit comments

Comments
 (0)