Skip to content

Commit

Permalink
Adding support for AWS KMS encryption to S3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtdowling
mtdowling committed Nov 12, 2014
1 parent 5c0f149 commit d8eb961
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Expand Up @@ -4,7 +4,8 @@

* Added support for the AWS Key Management Service.
* Added support for AWS CodeDeploy.
* Added support for Amazon KMS encryption to the Amazon EC2 client.
* Added support for AWS KMS encryption to the Amazon S3 client.
* Added support for AWS KMS encryption to the Amazon EC2 client.
* Added support for Amazon CloudWatch Logs delivery to the AWS CloudTrail
client.
* Added the GetTemplateSummary operation to the AWS CloudFormation client.
Expand Down
87 changes: 87 additions & 0 deletions src/Aws/S3/Resources/s3-2006-03-01.php
View file
Expand Up @@ -360,6 +360,11 @@
'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,
Expand Down Expand Up @@ -569,6 +574,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',
),
'ACP' => array(
'type' => 'object',
'additionalProperties' => true,
Expand Down Expand Up @@ -1073,6 +1083,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',
),
'SaveAs' => array(
'location' => 'response_body',
),
Expand Down Expand Up @@ -1241,6 +1256,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',
),
),
'errorResponses' => array(
array(
Expand Down Expand Up @@ -2246,6 +2266,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',
),
'ACP' => array(
'type' => 'object',
'additionalProperties' => true,
Expand Down Expand Up @@ -2498,6 +2523,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',
),
),
),
'UploadPartCopy' => array(
Expand Down Expand Up @@ -2612,6 +2642,11 @@
'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',
Expand Down Expand Up @@ -2665,6 +2700,11 @@
'location' => 'header',
'sentAs' => 'x-amz-version-id',
),
'SSEKMSKeyId' => array(
'type' => 'string',
'location' => 'header',
'sentAs' => 'x-amz-server-side-encryption-aws-kms-key-id',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -2708,6 +2748,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -2760,6 +2805,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -3488,6 +3538,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -3686,6 +3741,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -3755,6 +3815,10 @@
'type' => 'string',
'location' => 'xml',
),
'Delimiter' => array(
'type' => 'string',
'location' => 'xml',
),
'NextUploadIdMarker' => array(
'type' => 'string',
'location' => 'xml',
Expand Down Expand Up @@ -3959,6 +4023,10 @@
'type' => 'string',
'location' => 'xml',
),
'Delimiter' => array(
'type' => 'string',
'location' => 'xml',
),
'MaxKeys' => array(
'type' => 'numeric',
'location' => 'xml',
Expand Down Expand Up @@ -4052,6 +4120,10 @@
'type' => 'string',
'location' => 'xml',
),
'Delimiter' => array(
'type' => 'string',
'location' => 'xml',
),
'MaxKeys' => array(
'type' => 'numeric',
'location' => 'xml',
Expand Down Expand Up @@ -4308,6 +4380,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -4359,6 +4436,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down Expand Up @@ -4397,6 +4479,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',
),
'RequestId' => array(
'location' => 'header',
'sentAs' => 'x-amz-request-id',
Expand Down

0 comments on commit d8eb961

Please sign in to comment.