Skip to content

Commit c0401a5

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
AWS KMS announces the support for on-demand rotation of symmetric-encryption KMS keys with imported key material (EXTERNAL origin).
1 parent 8063bf0 commit c0401a5

File tree

96 files changed

+4947
-3723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+4947
-3723
lines changed

‎generator/ServiceModels/kms/kms-2014-11-01.api.json

Lines changed: 91 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
"requestUri":"/"
195195
},
196196
"input":{"shape":"DeleteImportedKeyMaterialRequest"},
197+
"output":{"shape":"DeleteImportedKeyMaterialResponse"},
197198
"errors":[
198199
{"shape":"InvalidArnException"},
199200
{"shape":"UnsupportedOperationException"},
@@ -1021,6 +1022,18 @@
10211022
"max":262144,
10221023
"min":1
10231024
},
1025+
"BackingKeyIdResponseType":{
1026+
"type":"string",
1027+
"max":64,
1028+
"min":0,
1029+
"pattern":"^[a-f0-9]+$"
1030+
},
1031+
"BackingKeyIdType":{
1032+
"type":"string",
1033+
"max":64,
1034+
"min":64,
1035+
"pattern":"^[a-f0-9]+$"
1036+
},
10241037
"BooleanType":{"type":"boolean"},
10251038
"CancelKeyDeletionRequest":{
10261039
"type":"structure",
@@ -1097,8 +1110,7 @@
10971110
},
10981111
"ConnectCustomKeyStoreResponse":{
10991112
"type":"structure",
1100-
"members":{
1101-
}
1113+
"members":{}
11021114
},
11031115
"ConnectionErrorCodeType":{
11041116
"type":"string",
@@ -1340,7 +1352,8 @@
13401352
"KeyId":{"shape":"KeyIdType"},
13411353
"Plaintext":{"shape":"PlaintextType"},
13421354
"EncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"},
1343-
"CiphertextForRecipient":{"shape":"CiphertextType"}
1355+
"CiphertextForRecipient":{"shape":"CiphertextType"},
1356+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
13441357
}
13451358
},
13461359
"DeleteAliasRequest":{
@@ -1359,14 +1372,21 @@
13591372
},
13601373
"DeleteCustomKeyStoreResponse":{
13611374
"type":"structure",
1362-
"members":{
1363-
}
1375+
"members":{}
13641376
},
13651377
"DeleteImportedKeyMaterialRequest":{
13661378
"type":"structure",
13671379
"required":["KeyId"],
13681380
"members":{
1369-
"KeyId":{"shape":"KeyIdType"}
1381+
"KeyId":{"shape":"KeyIdType"},
1382+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
1383+
}
1384+
},
1385+
"DeleteImportedKeyMaterialResponse":{
1386+
"type":"structure",
1387+
"members":{
1388+
"KeyId":{"shape":"KeyIdType"},
1389+
"KeyMaterialId":{"shape":"BackingKeyIdResponseType"}
13701390
}
13711391
},
13721392
"DependencyTimeoutException":{
@@ -1469,8 +1489,7 @@
14691489
},
14701490
"DisconnectCustomKeyStoreResponse":{
14711491
"type":"structure",
1472-
"members":{
1473-
}
1492+
"members":{}
14741493
},
14751494
"DryRunOperationException":{
14761495
"type":"structure",
@@ -1514,7 +1533,8 @@
15141533
"members":{
15151534
"CiphertextBlob":{"shape":"CiphertextType"},
15161535
"KeyId":{"shape":"KeyIdType"},
1517-
"EncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"}
1536+
"EncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"},
1537+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
15181538
}
15191539
},
15201540
"EncryptionAlgorithmSpec":{
@@ -1575,7 +1595,8 @@
15751595
"PublicKey":{"shape":"PublicKeyType"},
15761596
"KeyId":{"shape":"KeyIdType"},
15771597
"KeyPairSpec":{"shape":"DataKeyPairSpec"},
1578-
"CiphertextForRecipient":{"shape":"CiphertextType"}
1598+
"CiphertextForRecipient":{"shape":"CiphertextType"},
1599+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
15791600
}
15801601
},
15811602
"GenerateDataKeyPairWithoutPlaintextRequest":{
@@ -1598,7 +1619,8 @@
15981619
"PrivateKeyCiphertextBlob":{"shape":"CiphertextType"},
15991620
"PublicKey":{"shape":"PublicKeyType"},
16001621
"KeyId":{"shape":"KeyIdType"},
1601-
"KeyPairSpec":{"shape":"DataKeyPairSpec"}
1622+
"KeyPairSpec":{"shape":"DataKeyPairSpec"},
1623+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
16021624
}
16031625
},
16041626
"GenerateDataKeyRequest":{
@@ -1620,7 +1642,8 @@
16201642
"CiphertextBlob":{"shape":"CiphertextType"},
16211643
"Plaintext":{"shape":"PlaintextType"},
16221644
"KeyId":{"shape":"KeyIdType"},
1623-
"CiphertextForRecipient":{"shape":"CiphertextType"}
1645+
"CiphertextForRecipient":{"shape":"CiphertextType"},
1646+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
16241647
}
16251648
},
16261649
"GenerateDataKeyWithoutPlaintextRequest":{
@@ -1639,7 +1662,8 @@
16391662
"type":"structure",
16401663
"members":{
16411664
"CiphertextBlob":{"shape":"CiphertextType"},
1642-
"KeyId":{"shape":"KeyIdType"}
1665+
"KeyId":{"shape":"KeyIdType"},
1666+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
16431667
}
16441668
},
16451669
"GenerateMacRequest":{
@@ -1844,14 +1868,40 @@
18441868
"ImportToken":{"shape":"CiphertextType"},
18451869
"EncryptedKeyMaterial":{"shape":"CiphertextType"},
18461870
"ValidTo":{"shape":"DateType"},
1847-
"ExpirationModel":{"shape":"ExpirationModelType"}
1871+
"ExpirationModel":{"shape":"ExpirationModelType"},
1872+
"ImportType":{"shape":"ImportType"},
1873+
"KeyMaterialDescription":{"shape":"KeyMaterialDescriptionType"},
1874+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
18481875
}
18491876
},
18501877
"ImportKeyMaterialResponse":{
18511878
"type":"structure",
18521879
"members":{
1880+
"KeyId":{"shape":"KeyIdType"},
1881+
"KeyMaterialId":{"shape":"BackingKeyIdType"}
18531882
}
18541883
},
1884+
"ImportState":{
1885+
"type":"string",
1886+
"enum":[
1887+
"IMPORTED",
1888+
"PENDING_IMPORT"
1889+
]
1890+
},
1891+
"ImportType":{
1892+
"type":"string",
1893+
"enum":[
1894+
"NEW_KEY_MATERIAL",
1895+
"EXISTING_KEY_MATERIAL"
1896+
]
1897+
},
1898+
"IncludeKeyMaterial":{
1899+
"type":"string",
1900+
"enum":[
1901+
"ALL_KEY_MATERIAL",
1902+
"ROTATIONS_ONLY"
1903+
]
1904+
},
18551905
"IncorrectKeyException":{
18561906
"type":"structure",
18571907
"members":{
@@ -1993,6 +2043,20 @@
19932043
"CUSTOMER"
19942044
]
19952045
},
2046+
"KeyMaterialDescriptionType":{
2047+
"type":"string",
2048+
"max":256,
2049+
"min":0,
2050+
"pattern":"^[a-zA-Z0-9:/_\\s.-]+$"
2051+
},
2052+
"KeyMaterialState":{
2053+
"type":"string",
2054+
"enum":[
2055+
"NON_CURRENT",
2056+
"CURRENT",
2057+
"PENDING_ROTATION"
2058+
]
2059+
},
19962060
"KeyMetadata":{
19972061
"type":"structure",
19982062
"required":["KeyId"],
@@ -2025,7 +2089,8 @@
20252089
"MultiRegionConfiguration":{"shape":"MultiRegionConfiguration"},
20262090
"PendingDeletionWindowInDays":{"shape":"PendingWindowInDaysType"},
20272091
"MacAlgorithms":{"shape":"MacAlgorithmSpecList"},
2028-
"XksKeyConfiguration":{"shape":"XksKeyConfigurationType"}
2092+
"XksKeyConfiguration":{"shape":"XksKeyConfigurationType"},
2093+
"CurrentKeyMaterialId":{"shape":"BackingKeyIdType"}
20292094
}
20302095
},
20312096
"KeySpec":{
@@ -2151,6 +2216,7 @@
21512216
"required":["KeyId"],
21522217
"members":{
21532218
"KeyId":{"shape":"KeyIdType"},
2219+
"IncludeKeyMaterial":{"shape":"IncludeKeyMaterial"},
21542220
"Limit":{"shape":"LimitType"},
21552221
"Marker":{"shape":"MarkerType"}
21562222
}
@@ -2361,7 +2427,9 @@
23612427
"SourceKeyId":{"shape":"KeyIdType"},
23622428
"KeyId":{"shape":"KeyIdType"},
23632429
"SourceEncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"},
2364-
"DestinationEncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"}
2430+
"DestinationEncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"},
2431+
"SourceKeyMaterialId":{"shape":"BackingKeyIdType"},
2432+
"DestinationKeyMaterialId":{"shape":"BackingKeyIdType"}
23652433
}
23662434
},
23672435
"RecipientInfo":{
@@ -2454,6 +2522,12 @@
24542522
"type":"structure",
24552523
"members":{
24562524
"KeyId":{"shape":"KeyIdType"},
2525+
"KeyMaterialId":{"shape":"BackingKeyIdType"},
2526+
"KeyMaterialDescription":{"shape":"KeyMaterialDescriptionType"},
2527+
"ImportState":{"shape":"ImportState"},
2528+
"KeyMaterialState":{"shape":"KeyMaterialState"},
2529+
"ExpirationModel":{"shape":"ExpirationModelType"},
2530+
"ValidTo":{"shape":"DateType"},
24572531
"RotationDate":{"shape":"DateType"},
24582532
"RotationType":{"shape":"RotationType"}
24592533
}
@@ -2616,8 +2690,7 @@
26162690
},
26172691
"UpdateCustomKeyStoreResponse":{
26182692
"type":"structure",
2619-
"members":{
2620-
}
2693+
"members":{}
26212694
},
26222695
"UpdateKeyDescriptionRequest":{
26232696
"type":"structure",

0 commit comments

Comments
 (0)