Removing a few superfluous `x-amz-server-side-encryption-aws-kms-key-…

…id` from the S3 model
wooseokjin · Nov 25, 2014 · c96d77c · c96d77c
1 parent aa373be
commit c96d77c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@
   unmarshal item data from operation results back into JSON documents or native
   PHP arrays.
 * Adding support for media file encryption to Amazon Elastic Transcoder.
+* Removing a few superfluous `x-amz-server-side-encryption-aws-kms-key-id` from
+  the Amazon S3 model.
 
 ## 2.7.6 - 2014-11-20
 

diff --git a/src/Aws/S3/Resources/s3-2006-03-01.php b/src/Aws/S3/Resources/s3-2006-03-01.php
@@ -345,6 +345,11 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-server-side-encryption-customer-key-MD5',
                 ),
+                'SSEKMSKeyId' => array(
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
+                ),
                 'CopySourceSSECustomerAlgorithm' => array(
                     'type' => 'string',
                     'location' => 'header',
@@ -360,11 +365,6 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-copy-source-server-side-encryption-customer-key-MD5',
                 ),
-                'CopySourceSSEKMSKeyId' => array(
-                    'type' => 'string',
-                    'location' => 'header',
-                    'sentAs' => 'x-amz-copy-source-server-side-encryption-aws-kms-key-id',
-                ),
                 'ACP' => array(
                     'type' => 'object',
                     'additionalProperties' => true,
@@ -1083,11 +1083,6 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-server-side-encryption-customer-key-MD5',
                 ),
-                'SSEKMSKeyId' => array(
-                    'type' => 'string',
-                    'location' => 'header',
-                    'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
-                ),
                 'SaveAs' => array(
                     'location' => 'response_body',
                 ),
@@ -1256,11 +1251,6 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-server-side-encryption-customer-key-MD5',
                 ),
-                'SSEKMSKeyId' => array(
-                    'type' => 'string',
-                    'location' => 'header',
-                    'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
-                ),
             ),
             'errorResponses' => array(
                 array(
@@ -2588,11 +2578,6 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-server-side-encryption-customer-key-MD5',
                 ),
-                'SSEKMSKeyId' => array(
-                    'type' => 'string',
-                    'location' => 'header',
-                    'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
-                ),
             ),
         ),
         'UploadPartCopy' => array(
@@ -2707,11 +2692,6 @@
                     'location' => 'header',
                     'sentAs' => 'x-amz-copy-source-server-side-encryption-customer-key-MD5',
                 ),
-                'CopySourceSSEKMSKeyId' => array(
-                    'type' => 'string',
-                    'location' => 'header',
-                    'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
-                ),
                 'command.expects' => array(
                     'static' => true,
                     'default' => 'application/xml',