Remove unpopulated KeyMaterialId from Encrypt Response

Author: aws-sdk-dotnet-automation

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

@@ -1533,8 +1533,7 @@
       "members":{
         "CiphertextBlob":{"shape":"CiphertextType"},
         "KeyId":{"shape":"KeyIdType"},
-        "EncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"},
-        "KeyMaterialId":{"shape":"BackingKeyIdType"}
+        "EncryptionAlgorithm":{"shape":"EncryptionAlgorithmSpec"}
       }
     },
     "EncryptionAlgorithmSpec":{

generator/ServiceModels/kms/kms-2014-11-01.docs.json

@@ -118,12 +118,11 @@
     "BackingKeyIdType": {
       "base": null,
       "refs": {
-        "DecryptResponse$KeyMaterialId": "<p>The identifier of the key material used to decrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key.</p>",
+        "DecryptResponse$KeyMaterialId": "<p>The identifier of the key material used to decrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>",
         "DeleteImportedKeyMaterialRequest$KeyMaterialId": "<p>Identifies the imported key material you are deleting. </p> <important> <p>If no KeyMaterialId is specified, KMS deletes the current key material.</p> </important> <p>To get the list of key material IDs associated with a KMS key, use <a>ListKeyRotations</a>.</p>",
-        "EncryptResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key.</p>",
-        "GenerateDataKeyPairResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the private key.</p>",
+        "GenerateDataKeyPairResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the private key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>",
         "GenerateDataKeyPairWithoutPlaintextResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the private key.</p>",
-        "GenerateDataKeyResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the data key.</p>",
+        "GenerateDataKeyResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the data key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>",
         "GenerateDataKeyWithoutPlaintextResponse$KeyMaterialId": "<p>The identifier of the key material used to encrypt the data key.</p>",
         "ImportKeyMaterialRequest$KeyMaterialId": "<p>Identifies the key material being imported. This parameter is optional and only usable with symmetric encryption keys. You cannot specify a key material ID with <code>ImportType</code> set to <code>NEW_KEY_MATERIAL</code>. Whenever you import key material into a symmetric encryption key, KMS assigns a unique identifier to the key material based on the KMS key ID and the imported key material. When you re-import key material with a specified key material ID, KMS:</p> <ul> <li> <p>Computes the identifier for the key material</p> </li> <li> <p>Matches the computed identifier against the specified key material ID</p> </li> <li> <p>Verifies that the key material ID is already associated with the KMS key</p> </li> </ul> <p>To get the list of key material IDs associated with a KMS key, use <a>ListKeyRotations</a>.</p>",
         "ImportKeyMaterialResponse$KeyMaterialId": "<p>Identifies the imported key material.</p>",

generator/ServiceModels/kms/kms-2014-11-01.normal.json

@@ -1608,7 +1608,7 @@
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
-          "documentation":"<p>The identifier of the key material used to decrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key.</p>"
+          "documentation":"<p>The identifier of the key material used to decrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>"
         }
       }
     },
@@ -1918,10 +1918,6 @@
         "EncryptionAlgorithm":{
           "shape":"EncryptionAlgorithmSpec",
           "documentation":"<p>The encryption algorithm that was used to encrypt the plaintext.</p>"
-        },
-        "KeyMaterialId":{
-          "shape":"BackingKeyIdType",
-          "documentation":"<p>The identifier of the key material used to encrypt the ciphertext. This field is present only when the operation uses a symmetric encryption KMS key.</p>"
         }
       }
     },
@@ -2023,7 +2019,7 @@
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
-          "documentation":"<p>The identifier of the key material used to encrypt the private key.</p>"
+          "documentation":"<p>The identifier of the key material used to encrypt the private key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>"
         }
       }
     },
@@ -2136,7 +2132,7 @@
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
-          "documentation":"<p>The identifier of the key material used to encrypt the data key.</p>"
+          "documentation":"<p>The identifier of the key material used to encrypt the data key. This field is omitted if the request includes the <code>Recipient</code> parameter.</p>"
         }
       }
     },

sdk/code-analysis/ServiceAnalysis/KeyManagementService/Generated/PropertyValueRules.xml

@@ -296,12 +296,6 @@
     <min>1</min>
     <max>2048</max>
   </property-value-rule>
-  <property-value-rule>
-    <property>Amazon.KeyManagementService.Model.EncryptResponse.KeyMaterialId</property>
-    <min>64</min>
-    <max>64</max>
-    <pattern>^[a-f0-9]+$</pattern>
-  </property-value-rule>
   <property-value-rule>
     <property>Amazon.KeyManagementService.Model.GenerateDataKeyRequest.KeyId</property>
     <min>1</min>

sdk/src/Services/KeyManagementService/Generated/Model/DecryptResponse.cs

@@ -110,7 +110,8 @@ internal bool IsSetKeyId()
         /// Gets and sets the property KeyMaterialId. 
         /// <para>
         /// The identifier of the key material used to decrypt the ciphertext. This field is present
-        /// only when the operation uses a symmetric encryption KMS key.
+        /// only when the operation uses a symmetric encryption KMS key. This field is omitted
+        /// if the request includes the <c>Recipient</c> parameter.
         /// </para>
         /// </summary>
         [AWSProperty(Min=64, Max=64)]

sdk/src/Services/KeyManagementService/Generated/Model/EncryptResponse.cs

@@ -37,7 +37,6 @@ public partial class EncryptResponse : AmazonWebServiceResponse
         private MemoryStream _ciphertextBlob;
         private EncryptionAlgorithmSpec _encryptionAlgorithm;
         private string _keyId;
-        private string _keyMaterialId;
 
         /// <summary>
         /// Gets and sets the property CiphertextBlob. 
@@ -97,25 +96,5 @@ internal bool IsSetKeyId()
             return this._keyId != null;
         }
 
-        /// <summary>
-        /// Gets and sets the property KeyMaterialId. 
-        /// <para>
-        /// The identifier of the key material used to encrypt the ciphertext. This field is present
-        /// only when the operation uses a symmetric encryption KMS key.
-        /// </para>
-        /// </summary>
-        [AWSProperty(Min=64, Max=64)]
-        public string KeyMaterialId
-        {
-            get { return this._keyMaterialId; }
-            set { this._keyMaterialId = value; }
-        }
-
-        // Check to see if KeyMaterialId property is set
-        internal bool IsSetKeyMaterialId()
-        {
-            return this._keyMaterialId != null;
-        }
-
     }
 }

sdk/src/Services/KeyManagementService/Generated/Model/GenerateDataKeyPairResponse.cs

@@ -95,7 +95,8 @@ internal bool IsSetKeyId()
         /// <summary>
         /// Gets and sets the property KeyMaterialId. 
         /// <para>
-        /// The identifier of the key material used to encrypt the private key.
+        /// The identifier of the key material used to encrypt the private key. This field is
+        /// omitted if the request includes the <c>Recipient</c> parameter.
         /// </para>
         /// </summary>
         [AWSProperty(Min=64, Max=64)]

sdk/src/Services/KeyManagementService/Generated/Model/GenerateDataKeyResponse.cs

@@ -112,7 +112,8 @@ internal bool IsSetKeyId()
         /// <summary>
         /// Gets and sets the property KeyMaterialId. 
         /// <para>
-        /// The identifier of the key material used to encrypt the data key.
+        /// The identifier of the key material used to encrypt the data key. This field is omitted
+        /// if the request includes the <c>Recipient</c> parameter.
         /// </para>
         /// </summary>
         [AWSProperty(Min=64, Max=64)]

sdk/src/Services/KeyManagementService/Generated/Model/Internal/MarshallTransformations/EncryptResponseUnmarshaller.cs

@@ -70,12 +70,6 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont
                     response.KeyId = unmarshaller.Unmarshall(context);
                     continue;
                 }
-                if (context.TestExpression("KeyMaterialId", targetDepth))
-                {
-                    var unmarshaller = StringUnmarshaller.Instance;
-                    response.KeyMaterialId = unmarshaller.Unmarshall(context);
-                    continue;
-                }
             }
 
             return response;