Skip to content

CPK--Client Provided Encryption Key #7104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zezha-msft merged 6 commits into from
Sep 9, 2019
Merged

CPK--Client Provided Encryption Key #7104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19dc009
Add Generated Code
xiafu-msft Sep 6, 2019
f093d13
[Blob]CPK without test
xiafu-msft Sep 5, 2019
f343395
Fix Pylint
xiafu-msft Sep 7, 2019
656f7ef
[Blob][CPK]Test
xiafu-msft Sep 7, 2019
ba3e69e
Add Missing Recordings
xiafu-msft Sep 8, 2019
fc2d34b
[Blob][CPK]use existing field self.scheme
xiafu-msft Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions ...-blob/azure/storage/blob/_generated/aio/operations_async/_append_blob_operations_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ async def create(self, content_length, timeout=None, metadata=None, request_id=N
lease_id = None
if lease_access_conditions is not None:
lease_id = lease_access_conditions.lease_id
x_ms_encryption_key = None
encryption_key = None
if cpk_info is not None:
x_ms_encryption_key = cpk_info.x_ms_encryption_key
x_ms_encryption_key_sha256 = None
encryption_key = cpk_info.encryption_key
encryption_key_sha256 = None
if cpk_info is not None:
x_ms_encryption_key_sha256 = cpk_info.x_ms_encryption_key_sha256
x_ms_encryption_algorithm = None
encryption_key_sha256 = cpk_info.encryption_key_sha256
encryption_algorithm = None
if cpk_info is not None:
x_ms_encryption_algorithm = cpk_info.x_ms_encryption_algorithm
encryption_algorithm = cpk_info.encryption_algorithm
if_modified_since = None
if modified_access_conditions is not None:
if_modified_since = modified_access_conditions.if_modified_since
Expand All @@ -137,12 +137,6 @@ async def create(self, content_length, timeout=None, metadata=None, request_id=N
query_parameters = {}
if timeout is not None:
query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
if x_ms_encryption_key is not None:
query_parameters['x-ms-encryption-key'] = self._serialize.query("x_ms_encryption_key", x_ms_encryption_key, 'str')
if x_ms_encryption_key_sha256 is not None:
query_parameters['x-ms-encryption-key-sha256'] = self._serialize.query("x_ms_encryption_key_sha256", x_ms_encryption_key_sha256, 'str')
if x_ms_encryption_algorithm is not None:
query_parameters['x-ms-encryption-algorithm'] = self._serialize.query("x_ms_encryption_algorithm", x_ms_encryption_algorithm, 'EncryptionAlgorithmType')

# Construct headers
header_parameters = {}
Expand All @@ -167,6 +161,12 @@ async def create(self, content_length, timeout=None, metadata=None, request_id=N
header_parameters['x-ms-blob-content-disposition'] = self._serialize.header("blob_content_disposition", blob_content_disposition, 'str')
if lease_id is not None:
header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
if encryption_key is not None:
header_parameters['x-ms-encryption-key'] = self._serialize.header("encryption_key", encryption_key, 'str')
if encryption_key_sha256 is not None:
header_parameters['x-ms-encryption-key-sha256'] = self._serialize.header("encryption_key_sha256", encryption_key_sha256, 'str')
if encryption_algorithm is not None:
header_parameters['x-ms-encryption-algorithm'] = self._serialize.header("encryption_algorithm", encryption_algorithm, 'EncryptionAlgorithmType')
if if_modified_since is not None:
header_parameters['If-Modified-Since'] = self._serialize.header("if_modified_since", if_modified_since, 'rfc-1123')
if if_unmodified_since is not None:
Expand Down Expand Up @@ -257,15 +257,15 @@ async def append_block(self, body, content_length, timeout=None, transactional_c
append_position = None
if append_position_access_conditions is not None:
append_position = append_position_access_conditions.append_position
x_ms_encryption_key = None
encryption_key = None
if cpk_info is not None:
x_ms_encryption_key = cpk_info.x_ms_encryption_key
x_ms_encryption_key_sha256 = None
encryption_key = cpk_info.encryption_key
encryption_key_sha256 = None
if cpk_info is not None:
x_ms_encryption_key_sha256 = cpk_info.x_ms_encryption_key_sha256
x_ms_encryption_algorithm = None
encryption_key_sha256 = cpk_info.encryption_key_sha256
encryption_algorithm = None
if cpk_info is not None:
x_ms_encryption_algorithm = cpk_info.x_ms_encryption_algorithm
encryption_algorithm = cpk_info.encryption_algorithm
if_modified_since = None
if modified_access_conditions is not None:
if_modified_since = modified_access_conditions.if_modified_since
Expand All @@ -291,12 +291,6 @@ async def append_block(self, body, content_length, timeout=None, transactional_c
if timeout is not None:
query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
query_parameters['comp'] = self._serialize.query("self.comp", self.comp, 'str')
if x_ms_encryption_key is not None:
query_parameters['x-ms-encryption-key'] = self._serialize.query("x_ms_encryption_key", x_ms_encryption_key, 'str')
if x_ms_encryption_key_sha256 is not None:
query_parameters['x-ms-encryption-key-sha256'] = self._serialize.query("x_ms_encryption_key_sha256", x_ms_encryption_key_sha256, 'str')
if x_ms_encryption_algorithm is not None:
query_parameters['x-ms-encryption-algorithm'] = self._serialize.query("x_ms_encryption_algorithm", x_ms_encryption_algorithm, 'EncryptionAlgorithmType')

# Construct headers
header_parameters = {}
Expand All @@ -315,6 +309,12 @@ async def append_block(self, body, content_length, timeout=None, transactional_c
header_parameters['x-ms-blob-condition-maxsize'] = self._serialize.header("max_size", max_size, 'long')
if append_position is not None:
header_parameters['x-ms-blob-condition-appendpos'] = self._serialize.header("append_position", append_position, 'long')
if encryption_key is not None:
header_parameters['x-ms-encryption-key'] = self._serialize.header("encryption_key", encryption_key, 'str')
if encryption_key_sha256 is not None:
header_parameters['x-ms-encryption-key-sha256'] = self._serialize.header("encryption_key_sha256", encryption_key_sha256, 'str')
if encryption_algorithm is not None:
header_parameters['x-ms-encryption-algorithm'] = self._serialize.header("encryption_algorithm", encryption_algorithm, 'EncryptionAlgorithmType')
if if_modified_since is not None:
header_parameters['If-Modified-Since'] = self._serialize.header("if_modified_since", if_modified_since, 'rfc-1123')
if if_unmodified_since is not None:
Expand Down Expand Up @@ -411,15 +411,15 @@ async def append_block_from_url(self, source_url, content_length, source_range=N
:class:`StorageErrorException<azure.storage.blob.models.StorageErrorException>`
"""
error_map = kwargs.pop('error_map', None)
x_ms_encryption_key = None
encryption_key = None
if cpk_info is not None:
x_ms_encryption_key = cpk_info.x_ms_encryption_key
x_ms_encryption_key_sha256 = None
encryption_key = cpk_info.encryption_key
encryption_key_sha256 = None
if cpk_info is not None:
x_ms_encryption_key_sha256 = cpk_info.x_ms_encryption_key_sha256
x_ms_encryption_algorithm = None
encryption_key_sha256 = cpk_info.encryption_key_sha256
encryption_algorithm = None
if cpk_info is not None:
x_ms_encryption_algorithm = cpk_info.x_ms_encryption_algorithm
encryption_algorithm = cpk_info.encryption_algorithm
lease_id = None
if lease_access_conditions is not None:
lease_id = lease_access_conditions.lease_id
Expand Down Expand Up @@ -466,12 +466,6 @@ async def append_block_from_url(self, source_url, content_length, source_range=N
if timeout is not None:
query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
query_parameters['comp'] = self._serialize.query("self.comp", self.comp, 'str')
if x_ms_encryption_key is not None:
query_parameters['x-ms-encryption-key'] = self._serialize.query("x_ms_encryption_key", x_ms_encryption_key, 'str')
if x_ms_encryption_key_sha256 is not None:
query_parameters['x-ms-encryption-key-sha256'] = self._serialize.query("x_ms_encryption_key_sha256", x_ms_encryption_key_sha256, 'str')
if x_ms_encryption_algorithm is not None:
query_parameters['x-ms-encryption-algorithm'] = self._serialize.query("x_ms_encryption_algorithm", x_ms_encryption_algorithm, 'EncryptionAlgorithmType')

# Construct headers
header_parameters = {}
Expand All @@ -488,6 +482,12 @@ async def append_block_from_url(self, source_url, content_length, source_range=N
header_parameters['x-ms-version'] = self._serialize.header("self._config.version", self._config.version, 'str')
if request_id is not None:
header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
if encryption_key is not None:
header_parameters['x-ms-encryption-key'] = self._serialize.header("encryption_key", encryption_key, 'str')
if encryption_key_sha256 is not None:
header_parameters['x-ms-encryption-key-sha256'] = self._serialize.header("encryption_key_sha256", encryption_key_sha256, 'str')
if encryption_algorithm is not None:
header_parameters['x-ms-encryption-algorithm'] = self._serialize.header("encryption_algorithm", encryption_algorithm, 'EncryptionAlgorithmType')
if lease_id is not None:
header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
if max_size is not None:
Expand Down
Loading