Adds support for multi-Region keys

aws · Jun 16, 2021 · 0a3230a · 0a3230a
1 parent db5e786
commit 0a3230a
Show file tree

Hide file tree

Showing 76 changed files with 10,120 additions and 3,177 deletions.
diff --git a/docgenerator/AWSSDKDocSamples/KeyManagementService.GeneratedSamples.extra.xml b/docgenerator/AWSSDKDocSamples/KeyManagementService.GeneratedSamples.extra.xml
@@ -143,12 +143,12 @@
         <value>
             <example>
                 <para>
-                    The following example returns information (metadata) about the specified CMK.
+                    The following example gets metadata about a symmetric CMK.
                 </para>
                 <code
-                    title="To obtain information about a customer master key (CMK)"
+                    title="To get details about a customer master key (CMK)"
                     source=".\AWSSDKDocSamples\KeyManagementService\KeyManagementService.GeneratedSamples.cs"
-                    region="to-obtain-information-about-a-cmk-1478565820907" />
+                    region="get-key-details-1478565820907" />
             </example>
         </value>
     </doc>

diff --git a/docgenerator/AWSSDKDocSamples/KeyManagementService/KeyManagementService.GeneratedSamples.cs b/docgenerator/AWSSDKDocSamples/KeyManagementService/KeyManagementService.GeneratedSamples.cs
@@ -123,7 +123,7 @@ public void KeyManagementServiceDeleteImportedKeyMaterial()
 
         public void KeyManagementServiceDescribeKey()
         {
-            #region to-obtain-information-about-a-cmk-1478565820907
+            #region get-key-details-1478565820907
 
             var response = client.DescribeKey(new DescribeKeyRequest 
             {

diff --git a/generator/ServiceModels/kms/kms-2014-11-01.api.json b/generator/ServiceModels/kms/kms-2014-11-01.api.json
@@ -196,6 +196,7 @@
       "output":{"shape":"DescribeCustomKeyStoresResponse"},
       "errors":[
         {"shape":"CustomKeyStoreNotFoundException"},
+        {"shape":"InvalidMarkerException"},
         {"shape":"KMSInternalException"}
       ]
     },
@@ -631,6 +632,27 @@
         {"shape":"KMSInvalidStateException"}
       ]
     },
+    "ReplicateKey":{
+      "name":"ReplicateKey",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ReplicateKeyRequest"},
+      "output":{"shape":"ReplicateKeyResponse"},
+      "errors":[
+        {"shape":"AlreadyExistsException"},
+        {"shape":"DisabledException"},
+        {"shape":"InvalidArnException"},
+        {"shape":"KMSInvalidStateException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"MalformedPolicyDocumentException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TagException"},
+        {"shape":"UnsupportedOperationException"}
+      ]
+    },
     "RetireGrant":{
       "name":"RetireGrant",
       "http":{
@@ -779,6 +801,22 @@
         {"shape":"KMSInvalidStateException"}
       ]
     },
+    "UpdatePrimaryRegion":{
+      "name":"UpdatePrimaryRegion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdatePrimaryRegionRequest"},
+      "errors":[
+        {"shape":"DisabledException"},
+        {"shape":"InvalidArnException"},
+        {"shape":"KMSInvalidStateException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnsupportedOperationException"}
+      ]
+    },
     "Verify":{
       "name":"Verify",
       "http":{
@@ -1003,7 +1041,8 @@
         "Origin":{"shape":"OriginType"},
         "CustomKeyStoreId":{"shape":"CustomKeyStoreIdType"},
         "BypassPolicyLockoutSafetyCheck":{"shape":"BooleanType"},
-        "Tags":{"shape":"TagList"}
+        "Tags":{"shape":"TagList"},
+        "MultiRegion":{"shape":"NullableBooleanType"}
       }
     },
     "CreateKeyResponse":{
@@ -1690,17 +1729,23 @@
         "KeyManager":{"shape":"KeyManagerType"},
         "CustomerMasterKeySpec":{"shape":"CustomerMasterKeySpec"},
         "EncryptionAlgorithms":{"shape":"EncryptionAlgorithmSpecList"},
-        "SigningAlgorithms":{"shape":"SigningAlgorithmSpecList"}
+        "SigningAlgorithms":{"shape":"SigningAlgorithmSpecList"},
+        "MultiRegion":{"shape":"NullableBooleanType"},
+        "MultiRegionConfiguration":{"shape":"MultiRegionConfiguration"},
+        "PendingDeletionWindowInDays":{"shape":"PendingWindowInDaysType"}
       }
     },
     "KeyState":{
       "type":"string",
       "enum":[
+        "Creating",
         "Enabled",
         "Disabled",
         "PendingDeletion",
         "PendingImport",
-        "Unavailable"
+        "PendingReplicaDeletion",
+        "Unavailable",
+        "Updating"
       ]
     },
     "KeyStorePasswordType":{
@@ -1849,13 +1894,40 @@
         "DIGEST"
       ]
     },
+    "MultiRegionConfiguration":{
+      "type":"structure",
+      "members":{
+        "MultiRegionKeyType":{"shape":"MultiRegionKeyType"},
+        "PrimaryKey":{"shape":"MultiRegionKey"},
+        "ReplicaKeys":{"shape":"MultiRegionKeyList"}
+      }
+    },
+    "MultiRegionKey":{
+      "type":"structure",
+      "members":{
+        "Arn":{"shape":"ArnType"},
+        "Region":{"shape":"RegionType"}
+      }
+    },
+    "MultiRegionKeyList":{
+      "type":"list",
+      "member":{"shape":"MultiRegionKey"}
+    },
+    "MultiRegionKeyType":{
+      "type":"string",
+      "enum":[
+        "PRIMARY",
+        "REPLICA"
+      ]
+    },
     "NotFoundException":{
       "type":"structure",
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
       "exception":true
     },
+    "NullableBooleanType":{"type":"boolean"},
     "NumberOfBytesType":{
       "type":"integer",
       "max":1024,
@@ -1948,6 +2020,35 @@
         "DestinationEncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"}
       }
     },
+    "RegionType":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"^([a-z]+-){2,3}\\d+$"
+    },
+    "ReplicateKeyRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "ReplicaRegion"
+      ],
+      "members":{
+        "KeyId":{"shape":"KeyIdType"},
+        "ReplicaRegion":{"shape":"RegionType"},
+        "Policy":{"shape":"PolicyType"},
+        "BypassPolicyLockoutSafetyCheck":{"shape":"BooleanType"},
+        "Description":{"shape":"DescriptionType"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
+    "ReplicateKeyResponse":{
+      "type":"structure",
+      "members":{
+        "ReplicaKeyMetadata":{"shape":"KeyMetadata"},
+        "ReplicaPolicy":{"shape":"PolicyType"},
+        "ReplicaTags":{"shape":"TagList"}
+      }
+    },
     "RetireGrantRequest":{
       "type":"structure",
       "members":{
@@ -1979,7 +2080,9 @@
       "type":"structure",
       "members":{
         "KeyId":{"shape":"KeyIdType"},
-        "DeletionDate":{"shape":"DateType"}
+        "DeletionDate":{"shape":"DateType"},
+        "KeyState":{"shape":"KeyState"},
+        "PendingWindowInDays":{"shape":"PendingWindowInDaysType"}
       }
     },
     "SignRequest":{
@@ -2130,6 +2233,17 @@
         "Description":{"shape":"DescriptionType"}
       }
     },
+    "UpdatePrimaryRegionRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "PrimaryRegion"
+      ],
+      "members":{
+        "KeyId":{"shape":"KeyIdType"},
+        "PrimaryRegion":{"shape":"RegionType"}
+      }
+    },
     "VerifyRequest":{
       "type":"structure",
       "required":[