Skip to content
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

datalakestg82/change IsServerEncrypted not nullable #4005

Merged
merged 2 commits into from
Oct 9, 2022
Merged

datalakestg82/change IsServerEncrypted not nullable #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c648851
fix breaking change
microzchang Oct 8, 2022
370d3e8
fix rename issues
microzchang Oct 8, 2022
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
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/rest_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* The value of this header is set to true if the contents of the request are successfully
* encrypted using the specified algorithm, and false otherwise.
*/
Nullable<bool> IsServerEncrypted;
bool IsServerEncrypted = bool();
/**
* The SHA-256 hash of the encryption key used to encrypt the blob. This header is only
* returned when the blob was encrypted with a customer-provided key.
Expand Down Expand Up @@ -298,7 +298,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* The value of this header is set to true if the contents of the request are successfully
* encrypted using the specified algorithm, and false otherwise.
*/
Nullable<bool> IsServerEncrypted;
bool IsServerEncrypted = bool();
/**
* The SHA-256 hash of the encryption key used to encrypt the blob. This header is only
* returned when the blob was encrypted with a customer-provided key.
Expand All @@ -319,7 +319,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* The value of this header is set to true if the contents of the request are successfully
* encrypted using the specified algorithm, and false otherwise.
*/
Nullable<bool> IsServerEncrypted;
bool IsServerEncrypted = bool();
/**
* The SHA-256 hash of the encryption key used to encrypt the blob. This header is only
* returned when the blob was encrypted with a customer-provided key.
Expand Down
14 changes: 4 additions & 10 deletions sdk/storage/azure-storage-files-datalake/src/rest_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,11 +691,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
response.LastModified = DateTime::Parse(
pRawResponse->GetHeaders().at("Last-Modified"), Azure::DateTime::DateFormat::Rfc1123);
response.FileSize = std::stoll(pRawResponse->GetHeaders().at("Content-Length"));
if (pRawResponse->GetHeaders().count("x-ms-request-server-encrypted") != 0)
{
response.IsServerEncrypted
= pRawResponse->GetHeaders().at("x-ms-request-server-encrypted") == std::string("true");
}
response.IsServerEncrypted
= pRawResponse->GetHeaders().at("x-ms-request-server-encrypted") == std::string("true");
if (pRawResponse->GetHeaders().count("x-ms-encryption-key-sha256") != 0)
{
response.EncryptionKeySha256 = Core::Convert::Base64Decode(
Expand Down Expand Up @@ -775,11 +772,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
= Core::Convert::Base64Decode(pRawResponse->GetHeaders().at("x-ms-content-crc64"));
response.TransactionalContentHash.Value().Algorithm = HashAlgorithm::Crc64;
}
if (pRawResponse->GetHeaders().count("x-ms-request-server-encrypted") != 0)
{
response.IsServerEncrypted
= pRawResponse->GetHeaders().at("x-ms-request-server-encrypted") == std::string("true");
}
response.IsServerEncrypted
= pRawResponse->GetHeaders().at("x-ms-request-server-encrypted") == std::string("true");
if (pRawResponse->GetHeaders().count("x-ms-encryption-key-sha256") != 0)
{
response.EncryptionKeySha256 = Core::Convert::Base64Decode(
Expand Down
3 changes: 1 addition & 2 deletions sdk/storage/azure-storage-files-datalake/swagger/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ directive:
$["201"].headers["Content-Length"]["x-ms-client-name"] = "FileSize";
$["201"].headers["Content-Length"]["x-nullable"] = true;
$["201"].headers["x-ms-request-server-encrypted"]["x-nullable"] = true;
$["201"].headers["x-ms-request-server-encrypted"]["x-ms-client-default"] = "bool()";
Jinming-Hu marked this conversation as resolved.
Show resolved Hide resolved
$["201"].headers["x-ms-encryption-key-sha256"]["x-nullable"] = true;
delete $["201"].headers["x-ms-continuation"];
$["201"].schema = {
Expand Down Expand Up @@ -436,7 +437,6 @@ directive:
$["Content-MD5"]["x-nullable"] = true;
$["x-ms-content-crc64"]["x-ms-client-name"] = "TransactionalContentHash";
$["x-ms-content-crc64"]["x-nullable"] = true;
$["x-ms-request-server-encrypted"]["x-nullable"] = true;
$["x-ms-encryption-key-sha256"]["x-nullable"] = true;
delete $["ETag"];
```
Expand All @@ -449,6 +449,5 @@ directive:
where: $["x-ms-paths"]["/{filesystem}/{path}?action=flush"].patch.responses["200"].headers
transform: >
$["Content-Length"]["x-ms-client-name"] = "FileSize";
$["x-ms-request-server-encrypted"]["x-nullable"] = true;
$["x-ms-encryption-key-sha256"]["x-nullable"] = true;
```