KMS: wrap *every* operation result

inhabitedtype · Dec 16, 2021 · 355d1ed · 355d1ed
1 parent 722f8b6
commit 355d1ed
Show file tree

Hide file tree

Showing 28 changed files with 181 additions and 32 deletions.
diff --git a/input/kms/overrides.json b/input/kms/overrides.json
@@ -14,11 +14,54 @@
     },
     "additionalValues": {
         "operations": {
-            "Sign": {
-                "output": {
-                    "resultWrapper": "SignResult"
-                }
-            }
+            "CancelKeyDeletion": { "output": { "resultWrapper": "CancelKeyDeletionResult" } },
+            "ConnectCustomKeyStore": { "output": { "resultWrapper": "ConnectCustomKeyStoreResult" } },
+            "CreateAlias": { "output": { "resultWrapper": "CreateAliasResult" } },
+            "CreateCustomKeyStore": { "output": { "resultWrapper": "CreateCustomKeyStoreResult" } },
+            "CreateGrant": { "output": { "resultWrapper": "CreateGrantResult" } },
+            "CreateKey": { "output": { "resultWrapper": "CreateKeyResult" } },
+            "Decrypt": { "output": { "resultWrapper": "DecryptResult" } },
+            "DeleteAlias": { "output": { "resultWrapper": "DeleteAliasResult" } },
+            "DeleteCustomKeyStore": { "output": { "resultWrapper": "DeleteCustomKeyStoreResult" } },
+            "DeleteImportedKeyMaterial": { "output": { "resultWrapper": "DeleteImportedKeyMaterialResult" } },
+            "DescribeCustomKeyStores": { "output": { "resultWrapper": "DescribeCustomKeyStoresResult" } },
+            "DescribeKey": { "output": { "resultWrapper": "DescribeKeyResult" } },
+            "DisableKey": { "output": { "resultWrapper": "DisableKeyResult" } },
+            "DisableKeyRotation": { "output": { "resultWrapper": "DisableKeyRotationResult" } },
+            "DisconnectCustomKeyStore": { "output": { "resultWrapper": "DisconnectCustomKeyStoreResult" } },
+            "EnableKey": { "output": { "resultWrapper": "EnableKeyResult" } },
+            "EnableKeyRotation": { "output": { "resultWrapper": "EnableKeyRotationResult" } },
+            "Encrypt": { "output": { "resultWrapper": "EncryptResult" } },
+            "GenerateDataKey": { "output": { "resultWrapper": "GenerateDataKeyResult" } },
+            "GenerateDataKeyPair": { "output": { "resultWrapper": "GenerateDataKeyPairResult" } },
+            "GenerateDataKeyPairWithoutPlaintext": { "output": { "resultWrapper": "GenerateDataKeyPairWithoutPlaintextResult" } },
+            "GenerateDataKeyWithoutPlaintext": { "output": { "resultWrapper": "GenerateDataKeyWithoutPlaintextResult" } },
+            "GenerateRandom": { "output": { "resultWrapper": "GenerateRandomResult" } },
+            "GetKeyPolicy": { "output": { "resultWrapper": "GetKeyPolicyResult" } },
+            "GetKeyRotationStatus": { "output": { "resultWrapper": "GetKeyRotationStatusResult" } },
+            "GetParametersForImport": { "output": { "resultWrapper": "GetParametersForImportResult" } },
+            "GetPublicKey": { "output": { "resultWrapper": "GetPublicKeyResult" } },
+            "ImportKeyMaterial": { "output": { "resultWrapper": "ImportKeyMaterialResult" } },
+            "ListAliases": { "output": { "resultWrapper": "ListAliasesResult" } },
+            "ListGrants": { "output": { "resultWrapper": "ListGrantsResult" } },
+            "ListKeyPolicies": { "output": { "resultWrapper": "ListKeyPoliciesResult" } },
+            "ListKeys": { "output": { "resultWrapper": "ListKeysResult" } },
+            "ListResourceTags": { "output": { "resultWrapper": "ListResourceTagsResult" } },
+            "ListRetirableGrants": { "output": { "resultWrapper": "ListRetirableGrantsResult" } },
+            "PutKeyPolicy": { "output": { "resultWrapper": "PutKeyPolicyResult" } },
+            "ReEncrypt": { "output": { "resultWrapper": "ReEncryptResult" } },
+            "ReplicateKey": { "output": { "resultWrapper": "ReplicateKeyResult" } },
+            "RetireGrant": { "output": { "resultWrapper": "RetireGrantResult" } },
+            "RevokeGrant": { "output": { "resultWrapper": "RevokeGrantResult" } },
+            "ScheduleKeyDeletion": { "output": { "resultWrapper": "ScheduleKeyDeletionResult" } },
+            "Sign": { "output": { "resultWrapper": "SignResult" } },
+            "TagResource": { "output": { "resultWrapper": "TagResourceResult" } },
+            "UntagResource": { "output": { "resultWrapper": "UntagResourceResult" } },
+            "UpdateAlias": { "output": { "resultWrapper": "UpdateAliasResult" } },
+            "UpdateCustomKeyStore": { "output": { "resultWrapper": "UpdateCustomKeyStoreResult" } },
+            "UpdateKeyDescription": { "output": { "resultWrapper": "UpdateKeyDescriptionResult" } },
+            "UpdatePrimaryRegion": { "output": { "resultWrapper": "UpdatePrimaryRegionResult" } },
+            "Verify": { "output": { "resultWrapper": "VerifyResult" } }
         }
     }
 }
diff --git a/libraries/kms/lib/cancelKeyDeletion.ml b/libraries/kms/lib/cancelKeyDeletion.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "CancelKeyDeletionResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "CancelKeyDeletionResponse" (snd xml))
+        (Xml.member "CancelKeyDeletionResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp CancelKeyDeletionResponse.parse)

diff --git a/libraries/kms/lib/createCustomKeyStore.ml b/libraries/kms/lib/createCustomKeyStore.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "CreateCustomKeyStoreResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "CreateCustomKeyStoreResponse" (snd xml))
+        (Xml.member "CreateCustomKeyStoreResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp CreateCustomKeyStoreResponse.parse)

diff --git a/libraries/kms/lib/createGrant.ml b/libraries/kms/lib/createGrant.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "CreateGrantResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "CreateGrantResponse" (snd xml))
+        (Xml.member "CreateGrantResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp CreateGrantResponse.parse)

diff --git a/libraries/kms/lib/createKey.ml b/libraries/kms/lib/createKey.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "CreateKeyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "CreateKeyResponse" (snd xml))
+        (Xml.member "CreateKeyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp CreateKeyResponse.parse)

diff --git a/libraries/kms/lib/decrypt.ml b/libraries/kms/lib/decrypt.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "DecryptResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "DecryptResponse" (snd xml))
+        (Xml.member "DecryptResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp DecryptResponse.parse)

diff --git a/libraries/kms/lib/describeCustomKeyStores.ml b/libraries/kms/lib/describeCustomKeyStores.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "DescribeCustomKeyStoresResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "DescribeCustomKeyStoresResponse" (snd xml))
+        (Xml.member "DescribeCustomKeyStoresResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp DescribeCustomKeyStoresResponse.parse)

diff --git a/libraries/kms/lib/describeKey.ml b/libraries/kms/lib/describeKey.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "DescribeKeyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "DescribeKeyResponse" (snd xml))
+        (Xml.member "DescribeKeyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp DescribeKeyResponse.parse)

diff --git a/libraries/kms/lib/encrypt.ml b/libraries/kms/lib/encrypt.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "EncryptResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "EncryptResponse" (snd xml))
+        (Xml.member "EncryptResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp EncryptResponse.parse)

diff --git a/libraries/kms/lib/generateDataKey.ml b/libraries/kms/lib/generateDataKey.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GenerateDataKeyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GenerateDataKeyResponse" (snd xml))
+        (Xml.member "GenerateDataKeyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GenerateDataKeyResponse.parse)

diff --git a/libraries/kms/lib/generateDataKeyPair.ml b/libraries/kms/lib/generateDataKeyPair.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GenerateDataKeyPairResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GenerateDataKeyPairResponse" (snd xml))
+        (Xml.member "GenerateDataKeyPairResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GenerateDataKeyPairResponse.parse)

diff --git a/libraries/kms/lib/generateDataKeyPairWithoutPlaintext.ml b/libraries/kms/lib/generateDataKeyPairWithoutPlaintext.ml
@@ -28,7 +28,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GenerateDataKeyPairWithoutPlaintextResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GenerateDataKeyPairWithoutPlaintextResponse" (snd xml))
+        (Xml.member "GenerateDataKeyPairWithoutPlaintextResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GenerateDataKeyPairWithoutPlaintextResponse.parse)

diff --git a/libraries/kms/lib/generateDataKeyWithoutPlaintext.ml b/libraries/kms/lib/generateDataKeyWithoutPlaintext.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GenerateDataKeyWithoutPlaintextResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GenerateDataKeyWithoutPlaintextResponse" (snd xml))
+        (Xml.member "GenerateDataKeyWithoutPlaintextResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GenerateDataKeyWithoutPlaintextResponse.parse)

diff --git a/libraries/kms/lib/generateRandom.ml b/libraries/kms/lib/generateRandom.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GenerateRandomResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GenerateRandomResponse" (snd xml))
+        (Xml.member "GenerateRandomResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GenerateRandomResponse.parse)

diff --git a/libraries/kms/lib/getKeyPolicy.ml b/libraries/kms/lib/getKeyPolicy.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GetKeyPolicyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GetKeyPolicyResponse" (snd xml))
+        (Xml.member "GetKeyPolicyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GetKeyPolicyResponse.parse)

diff --git a/libraries/kms/lib/getKeyRotationStatus.ml b/libraries/kms/lib/getKeyRotationStatus.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GetKeyRotationStatusResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GetKeyRotationStatusResponse" (snd xml))
+        (Xml.member "GetKeyRotationStatusResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GetKeyRotationStatusResponse.parse)

diff --git a/libraries/kms/lib/getParametersForImport.ml b/libraries/kms/lib/getParametersForImport.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GetParametersForImportResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GetParametersForImportResponse" (snd xml))
+        (Xml.member "GetParametersForImportResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GetParametersForImportResponse.parse)

diff --git a/libraries/kms/lib/getPublicKey.ml b/libraries/kms/lib/getPublicKey.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "GetPublicKeyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "GetPublicKeyResponse" (snd xml))
+        (Xml.member "GetPublicKeyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp GetPublicKeyResponse.parse)

diff --git a/libraries/kms/lib/listAliases.ml b/libraries/kms/lib/listAliases.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListAliasesResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListAliasesResponse" (snd xml))
+        (Xml.member "ListAliasesResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListAliasesResponse.parse)

diff --git a/libraries/kms/lib/listGrants.ml b/libraries/kms/lib/listGrants.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListGrantsResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListGrantsResponse" (snd xml))
+        (Xml.member "ListGrantsResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListGrantsResponse.parse)

diff --git a/libraries/kms/lib/listKeyPolicies.ml b/libraries/kms/lib/listKeyPolicies.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListKeyPoliciesResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListKeyPoliciesResponse" (snd xml))
+        (Xml.member "ListKeyPoliciesResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListKeyPoliciesResponse.parse)

diff --git a/libraries/kms/lib/listKeys.ml b/libraries/kms/lib/listKeys.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListKeysResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListKeysResponse" (snd xml))
+        (Xml.member "ListKeysResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListKeysResponse.parse)

diff --git a/libraries/kms/lib/listResourceTags.ml b/libraries/kms/lib/listResourceTags.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListResourceTagsResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListResourceTagsResponse" (snd xml))
+        (Xml.member "ListResourceTagsResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListResourceTagsResponse.parse)

diff --git a/libraries/kms/lib/listRetirableGrants.ml b/libraries/kms/lib/listRetirableGrants.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ListRetirableGrantsResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ListRetirableGrantsResponse" (snd xml))
+        (Xml.member "ListRetirableGrantsResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ListGrantsResponse.parse)

diff --git a/libraries/kms/lib/reEncrypt.ml b/libraries/kms/lib/reEncrypt.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ReEncryptResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ReEncryptResponse" (snd xml))
+        (Xml.member "ReEncryptResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ReEncryptResponse.parse)

diff --git a/libraries/kms/lib/replicateKey.ml b/libraries/kms/lib/replicateKey.ml
@@ -25,7 +25,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ReplicateKeyResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ReplicateKeyResponse" (snd xml))
+        (Xml.member "ReplicateKeyResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ReplicateKeyResponse.parse)

diff --git a/libraries/kms/lib/scheduleKeyDeletion.ml b/libraries/kms/lib/scheduleKeyDeletion.ml
@@ -26,7 +26,11 @@ let to_http service region req =
 let of_http body =
   try
     let xml = Ezxmlm.from_string body in
-    let resp = Xml.member "ScheduleKeyDeletionResponse" (snd xml) in
+    let resp =
+      Util.option_bind
+        (Xml.member "ScheduleKeyDeletionResponse" (snd xml))
+        (Xml.member "ScheduleKeyDeletionResult")
+    in
     try
       Util.or_error
         (Util.option_bind resp ScheduleKeyDeletionResponse.parse)