github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed unwanted Share prefix and moved unused models to details. (#1940)

Browse Source 
* Removed unwanted Share prefix and moved unused models to details.

* Resolve build issues.

* Resolve comments.

* Access Tier change.

* FileServiceProperties to ShareServiceProperties
This commit is contained in:
Kan Tang 2021-03-19 14:59:15 +08:00 committed by GitHub
parent 37e5b2ad79
commit de28afadc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 167 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/storage/azure-storage-files-shares/CHANGELOG.md
View File

@ -19,12 +19,18 @@
- Renamed `GetSharePropertiesResult` to `ShareProperties`.
- Renamed `GetShareDirectoryPropertiesResult` to `DirectoryProperties`.
- Renamed `GetShareFilePropertiesResult` to `FileProperties`
- Renamed `GetServicePropertiesResult` to `FileServiceProperties`.
- Renamed `GetServicePropertiesResult` to `ShareServiceProperties`.
- Removed `Share` from the names of return types and option types.
- Renamed `AbortCopyFileOptions` to `AbortFileCopyOptions`.
- Removed `RequestId` from the return types.
- Changed `BodyStream` parameter of `UploadRange` function from pointer to reference.
- Removed `PreviousShareSnapshot` from `GetShareFileRangeListOptions`, use `ShareFileClient::GetRangeListDiff` instead.
- Renamed `ShareAccessTier` to `AccessTier`.
- Renamed `ShareRetentionPolicy` to `RetentionPolicy`.
- Renamed `ShareProtocolSettings` to `ProtocolSettings`.
- Renamed `CopyStatusType` to `CopyStatus`
- Removed `FileRangeWriteType`.
- Removed `ShareFileRangeList`.
## 12.0.0-beta.8 (2021-02-12)

189
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
View File

@ -80,22 +80,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::string ParentFileId;
};
// Specifies the access tier of the share.
class ShareAccessTier {
class AccessTier {
public:
ShareAccessTier() = default;
explicit ShareAccessTier(std::string value) : m_value(std::move(value)) {}
bool operator==(const ShareAccessTier& other) const { return m_value == other.m_value; }
bool operator!=(const ShareAccessTier& other) const { return !(*this == other); }
AccessTier() = default;
explicit AccessTier(std::string value) : m_value(std::move(value)) {}
bool operator==(const AccessTier& other) const { return m_value == other.m_value; }
bool operator!=(const AccessTier& other) const { return !(*this == other); }
const std::string& ToString() const { return m_value; }
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static ShareAccessTier TransactionOptimized;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static ShareAccessTier Hot;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static ShareAccessTier Cool;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static ShareAccessTier Premium;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static AccessTier TransactionOptimized;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static AccessTier Hot;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static AccessTier Cool;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static AccessTier Premium;
private:
std::string m_value;
}; // extensible enum ShareAccessTier
}; // extensible enum AccessTier
// Specifies the option to copy file security descriptor from source file or to set it using the
// value which is defined by the header value of x-ms-file-permission or
@ -285,7 +285,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<DateTime> NextAllowedQuotaDowngradeTime;
Azure::Nullable<DateTime> DeletedOn;
int32_t RemainingRetentionDays = int32_t();
Azure::Nullable<ShareAccessTier> AccessTier; // The access tier of the share.
Azure::Nullable<Models::AccessTier> AccessTier; // The access tier of the share.
Azure::Nullable<DateTime> AccessTierChangedOn;
Azure::Nullable<std::string> AccessTierTransitionState;
LeaseStatusType LeaseStatus;
@ -305,7 +305,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
};
// The retention policy.
struct ShareRetentionPolicy
struct RetentionPolicy
{
bool Enabled
= bool(); // Indicates whether a retention policy is enabled for the File service. If
@ -323,7 +323,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
bool Enabled = bool(); // Indicates whether metrics are enabled for the File service.
Azure::Nullable<bool> IncludeApis; // Indicates whether metrics should generate summary
// statistics for called API operations.
ShareRetentionPolicy RetentionPolicy;
Models::RetentionPolicy RetentionPolicy;
};
// Settings for SMB multichannel
@ -353,18 +353,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
};
// Protocol settings
struct ShareProtocolSettings
struct ProtocolSettings
{
SmbSettings Settings; // Settings for SMB protocol.
};
// The list of file ranges
struct ShareFileRangeList
{
std::vector<Core::Http::HttpRange> Ranges;
std::vector<Core::Http::HttpRange> ClearRanges;
};
// Stats for the share.
struct ShareStats
{
@ -381,14 +374,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
};
// Storage service properties.
struct FileServiceProperties
struct ShareServiceProperties
{
Metrics HourMetrics; // A summary of request statistics grouped by API in hourly aggregates
// for files.
Metrics MinuteMetrics; // A summary of request statistics grouped by API in minute aggregates
// for files.
std::vector<CorsRule> Cors; // The set of CORS rules.
Azure::Nullable<ShareProtocolSettings> Protocol; // Protocol settings
Azure::Nullable<ProtocolSettings> Protocol; // Protocol settings
};
// A permission (a security descriptor) at the share level.
@ -418,42 +411,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}; // extensible enum LeaseAction
// State of the copy operation identified by 'x-ms-copy-id'.
class CopyStatusType {
class CopyStatus {
public:
CopyStatusType() = default;
explicit CopyStatusType(std::string value) : m_value(std::move(value)) {}
bool operator==(const CopyStatusType& other) const { return m_value == other.m_value; }
bool operator!=(const CopyStatusType& other) const { return !(*this == other); }
CopyStatus() = default;
explicit CopyStatus(std::string value) : m_value(std::move(value)) {}
bool operator==(const CopyStatus& other) const { return m_value == other.m_value; }
bool operator!=(const CopyStatus& other) const { return !(*this == other); }
const std::string& ToString() const { return m_value; }
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatusType Pending;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatusType Success;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatusType Aborted;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatusType Failed;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatus Pending;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatus Success;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatus Aborted;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static CopyStatus Failed;
private:
std::string m_value;
}; // extensible enum CopyStatusType
// Specify one of the following options: - Update: Writes the bytes specified by the request
// body into the specified range. The Range and Content-Length headers must match to perform the
// update. - Clear: Clears the specified range and releases the space used in storage for that
// range. To clear a range, set the Content-Length header to zero, and set the Range header to a
// value that indicates the range to clear, up to maximum file size.
class FileRangeWriteType {
public:
FileRangeWriteType() = default;
explicit FileRangeWriteType(std::string value) : m_value(std::move(value)) {}
bool operator==(const FileRangeWriteType& other) const { return m_value == other.m_value; }
bool operator!=(const FileRangeWriteType& other) const { return !(*this == other); }
const std::string& ToString() const { return m_value; }
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static FileRangeWriteType Update;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static FileRangeWriteType Clear;
private:
std::string m_value;
}; // extensible enum FileRangeWriteType
}; // extensible enum CopyStatus
enum class ListSharesIncludeType
{
@ -655,6 +628,33 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<std::string> ContinuationToken;
};
// The list of file ranges
struct RangeList
{
std::vector<Core::Http::HttpRange> Ranges;
std::vector<Core::Http::HttpRange> ClearRanges;
};
// Specify one of the following options: - Update: Writes the bytes specified by the request
// body into the specified range. The Range and Content-Length headers must match to perform the
// update. - Clear: Clears the specified range and releases the space used in storage for that
// range. To clear a range, set the Content-Length header to zero, and set the Range header to a
// value that indicates the range to clear, up to maximum file size.
class FileRangeWriteType {
public:
FileRangeWriteType() = default;
explicit FileRangeWriteType(std::string value) : m_value(std::move(value)) {}
bool operator==(const FileRangeWriteType& other) const { return m_value == other.m_value; }
bool operator!=(const FileRangeWriteType& other) const { return !(*this == other); }
const std::string& ToString() const { return m_value; }
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static FileRangeWriteType Update;
AZ_STORAGE_FILES_SHARES_DLLEXPORT const static FileRangeWriteType Clear;
private:
std::string m_value;
}; // extensible enum FileRangeWriteType
struct ServiceSetPropertiesResult
{
};
@ -664,7 +664,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Metrics HourMetrics;
Metrics MinuteMetrics;
std::vector<CorsRule> Cors;
Azure::Nullable<ShareProtocolSettings> Protocol;
Azure::Nullable<ProtocolSettings> Protocol;
};
struct ServiceListSharesSinglePageResult
@ -695,7 +695,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<LeaseDurationType> LeaseDuration;
Azure::Nullable<LeaseStateType> LeaseState;
Azure::Nullable<LeaseStatusType> LeaseStatus;
Azure::Nullable<ShareAccessTier> AccessTier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<DateTime> AccessTierChangedOn;
Azure::Nullable<std::string> AccessTierTransitionState;
};
@ -876,7 +876,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<std::string> CopyId;
Azure::Nullable<std::string> CopyProgress;
Azure::Nullable<std::string> CopySource;
Azure::Nullable<CopyStatusType> CopyStatus;
Azure::Nullable<Models::CopyStatus> CopyStatus;
bool IsServerEncrypted = bool();
FileSmbProperties SmbProperties;
Azure::Nullable<LeaseDurationType> LeaseDuration;
@ -896,7 +896,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<std::string> CopyId;
Azure::Nullable<std::string> CopyProgress;
Azure::Nullable<std::string> CopySource;
Azure::Nullable<CopyStatusType> CopyStatus;
Azure::Nullable<Models::CopyStatus> CopyStatus;
bool IsServerEncrypted = bool();
FileSmbProperties SmbProperties;
Azure::Nullable<LeaseDurationType> LeaseDuration;
@ -979,7 +979,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::ETag ETag;
DateTime LastModified;
std::string CopyId;
CopyStatusType CopyStatus;
Models::CopyStatus CopyStatus;
};
struct FileAbortCopyResult
@ -1058,7 +1058,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
public:
struct SetPropertiesOptions
{
FileServiceProperties ServiceProperties;
ShareServiceProperties ServiceProperties;
Azure::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = _detail::DefaultServiceApiVersion;
};
@ -1073,7 +1073,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::string xml_body;
{
_internal::XmlWriter writer;
FileServicePropertiesToXml(writer, setPropertiesOptions.ServiceProperties);
ShareServicePropertiesToXml(writer, setPropertiesOptions.ServiceProperties);
writer.Write(_internal::XmlNode{_internal::XmlNodeType::End});
xml_body = writer.GetDocument();
}
@ -1197,9 +1197,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
}
static void ShareRetentionPolicyToXml(
static void RetentionPolicyToXml(
_internal::XmlWriter& writer,
const ShareRetentionPolicy& object)
const RetentionPolicy& object)
{
writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
writer.Write(_internal::XmlNode{
@ -1236,7 +1236,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
}
writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "RetentionPolicy"});
ShareRetentionPolicyToXml(writer, object.RetentionPolicy);
RetentionPolicyToXml(writer, object.RetentionPolicy);
writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
}
@ -1287,18 +1287,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
}
static void ShareProtocolSettingsToXml(
static void ProtocolSettingsToXml(
_internal::XmlWriter& writer,
const ShareProtocolSettings& object)
const ProtocolSettings& object)
{
writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "ProtocolSettings"});
SmbSettingsToXml(writer, object.Settings);
writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
}
static void FileServicePropertiesToXml(
static void ShareServicePropertiesToXml(
_internal::XmlWriter& writer,
const FileServiceProperties& object)
const ShareServiceProperties& object)
{
writer.Write(
_internal::XmlNode{_internal::XmlNodeType::StartTag, "StorageServiceProperties"});
@ -1319,7 +1319,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
if (object.Protocol.HasValue())
{
ShareProtocolSettingsToXml(writer, object.Protocol.GetValue());
ProtocolSettingsToXml(writer, object.Protocol.GetValue());
}
writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
}
@ -1336,8 +1336,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
reinterpret_cast<const char*>(bodyBuffer.data()), bodyBuffer.size());
ServiceGetPropertiesResult result = bodyBuffer.empty()
? ServiceGetPropertiesResult()
: ServiceGetPropertiesResultFromFileServiceProperties(
FileServicePropertiesFromXml(reader));
: ServiceGetPropertiesResultFromShareServiceProperties(
ShareServicePropertiesFromXml(reader));
return Azure::Response<ServiceGetPropertiesResult>(
std::move(result), std::move(responsePtr));
}
@ -1348,9 +1348,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
}
static ShareRetentionPolicy ShareRetentionPolicyFromXml(_internal::XmlReader& reader)
static RetentionPolicy RetentionPolicyFromXml(_internal::XmlReader& reader)
{
auto result = ShareRetentionPolicy();
auto result = RetentionPolicy();
enum class XmlTagName
{
Days,
@ -1465,7 +1465,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
if (path.size() == 1 && path[0] == XmlTagName::RetentionPolicy)
{
result.RetentionPolicy = ShareRetentionPolicyFromXml(reader);
result.RetentionPolicy = RetentionPolicyFromXml(reader);
path.pop_back();
}
}
@ -1679,9 +1679,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
return result;
}
static ShareProtocolSettings ShareProtocolSettingsFromXml(_internal::XmlReader& reader)
static ProtocolSettings ProtocolSettingsFromXml(_internal::XmlReader& reader)
{
auto result = ShareProtocolSettings();
auto result = ProtocolSettings();
enum class XmlTagName
{
SMB,
@ -1732,9 +1732,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
return result;
}
static FileServiceProperties FileServicePropertiesFromXml(_internal::XmlReader& reader)
static ShareServiceProperties ShareServicePropertiesFromXml(_internal::XmlReader& reader)
{
auto result = FileServiceProperties();
auto result = ShareServiceProperties();
enum class XmlTagName
{
Cors,
@ -1814,7 +1814,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
path.size() == 2 && path[0] == XmlTagName::StorageServiceProperties
&& path[1] == XmlTagName::ProtocolSettings)
{
result.Protocol = ShareProtocolSettingsFromXml(reader);
result.Protocol = ProtocolSettingsFromXml(reader);
path.pop_back();
}
else if (
@ -1832,8 +1832,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
return result;
}
static ServiceGetPropertiesResult ServiceGetPropertiesResultFromFileServiceProperties(
FileServiceProperties object)
static ServiceGetPropertiesResult ServiceGetPropertiesResultFromShareServiceProperties(
ShareServiceProperties object)
{
ServiceGetPropertiesResult result;
result.HourMetrics = std::move(object.HourMetrics);
@ -2151,7 +2151,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
if (path.size() == 1 && path[0] == XmlTagName::AccessTier)
{
result.AccessTier = ShareAccessTier(node.Value);
result.AccessTier = AccessTier(node.Value);
}
else if (path.size() == 1 && path[0] == XmlTagName::AccessTierChangeTime)
{
@ -2461,7 +2461,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<int32_t> Timeout;
Storage::Metadata Metadata;
Azure::Nullable<int64_t> ShareQuota;
Azure::Nullable<ShareAccessTier> XMsAccessTier;
Azure::Nullable<AccessTier> XMsAccessTier;
std::string ApiVersionParameter = _detail::DefaultServiceApiVersion;
};
@ -2894,7 +2894,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = _detail::DefaultServiceApiVersion;
Azure::Nullable<int64_t> ShareQuota;
Azure::Nullable<ShareAccessTier> XMsAccessTier;
Azure::Nullable<AccessTier> XMsAccessTier;
Azure::Nullable<std::string> LeaseIdOptional;
};
@ -3210,7 +3210,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
if (response.GetHeaders().find("x-ms-access-tier") != response.GetHeaders().end())
{
result.AccessTier = ShareAccessTier(response.GetHeaders().at("x-ms-access-tier"));
result.AccessTier = AccessTier(response.GetHeaders().at("x-ms-access-tier"));
}
if (response.GetHeaders().find(_detail::HeaderAccessTierChangedOn)
!= response.GetHeaders().end())
@ -6092,8 +6092,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
if (response.GetHeaders().find(_detail::HeaderCopyStatus)
!= response.GetHeaders().end())
{
result.CopyStatus
= CopyStatusType(response.GetHeaders().at(_detail::HeaderCopyStatus));
result.CopyStatus = CopyStatus(response.GetHeaders().at(_detail::HeaderCopyStatus));
}
if (response.GetHeaders().find(_detail::HeaderContentHashMd5)
!= response.GetHeaders().end())
@ -6251,8 +6250,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
if (response.GetHeaders().find(_detail::HeaderCopyStatus)
!= response.GetHeaders().end())
{
result.CopyStatus
= CopyStatusType(response.GetHeaders().at(_detail::HeaderCopyStatus));
result.CopyStatus = CopyStatus(response.GetHeaders().at(_detail::HeaderCopyStatus));
}
if (response.GetHeaders().find(_detail::HeaderContentHashMd5)
!= response.GetHeaders().end())
@ -6395,8 +6393,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
if (response.GetHeaders().find(_detail::HeaderCopyStatus)
!= response.GetHeaders().end())
{
result.CopyStatus
= CopyStatusType(response.GetHeaders().at(_detail::HeaderCopyStatus));
result.CopyStatus = CopyStatus(response.GetHeaders().at(_detail::HeaderCopyStatus));
}
if (response.GetHeaders().find(_detail::HeaderIsServerEncrypted)
!= response.GetHeaders().end())
@ -6699,7 +6696,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
reinterpret_cast<const char*>(bodyBuffer.data()), bodyBuffer.size());
FileGetRangeListResult result = bodyBuffer.empty()
? FileGetRangeListResult()
: FileGetRangeListResultFromShareFileRangeList(ShareFileRangeListFromXml(reader));
: FileGetRangeListResultFromRangeList(RangeListFromXml(reader));
result.LastModified = DateTime::Parse(
response.GetHeaders().at(_detail::HeaderLastModified),
DateTime::DateFormat::Rfc1123);
@ -6715,9 +6712,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
}
static ShareFileRangeList ShareFileRangeListFromXml(_internal::XmlReader& reader)
static RangeList RangeListFromXml(_internal::XmlReader& reader)
{
auto result = ShareFileRangeList();
auto result = RangeList();
enum class XmlTagName
{
ClearRange,
@ -6784,8 +6781,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
return result;
}
static FileGetRangeListResult FileGetRangeListResultFromShareFileRangeList(
ShareFileRangeList object)
static FileGetRangeListResult FileGetRangeListResultFromRangeList(RangeList object)
{
FileGetRangeListResult result;
result.Ranges = std::move(object.Ranges);
@ -6813,8 +6809,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
if (response.GetHeaders().find(_detail::HeaderCopyStatus)
!= response.GetHeaders().end())
{
result.CopyStatus
= CopyStatusType(response.GetHeaders().at(_detail::HeaderCopyStatus));
result.CopyStatus = CopyStatus(response.GetHeaders().at(_detail::HeaderCopyStatus));
}
return Azure::Response<FileStartCopyResult>(std::move(result), std::move(responsePtr));
}

4
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp
View File

@ -76,7 +76,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @brief Specifies the access tier of the share. This is only valid for standard file account
* and the value can only be one of `Hot`, `Cool` or `TransactionOptimized`
*/
Azure::Nullable<Models::ShareAccessTier> AccessTier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Specifies the maximum size of the share, in gigabytes.
@ -110,7 +110,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @brief Specifies the access tier of the share. This is only valid for standard file account
* and the value can only be one of `Hot`, `Cool` or `TransactionOptimized`
*/
Azure::Nullable<Models::ShareAccessTier> AccessTier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Specifies the maximum size of the share, in gigabytes.

2
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
View File

@ -115,7 +115,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Nullable<std::string> CopyId;
Nullable<std::string> CopyProgress;
Nullable<std::string> CopySource;
Nullable<CopyStatusType> CopyStatus;
Nullable<Models::CopyStatus> CopyStatus;
bool IsServerEncrypted = bool();
FileSmbProperties SmbProperties;
Nullable<LeaseDurationType> LeaseDuration;

4
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp
View File

@ -87,7 +87,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* when setting the service properties.
*/
Azure::Response<Models::SetServicePropertiesResult> SetProperties(
Models::FileServiceProperties properties,
Models::ShareServiceProperties properties,
const SetServicePropertiesOptions& options = SetServicePropertiesOptions(),
const Azure::Core::Context& context = Azure::Core::Context()) const;
@ -97,7 +97,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @param context Context for cancelling long running operations.
* @return Azure::Response<Models::FileServiceProperties> The properties of the service.
*/
Azure::Response<Models::FileServiceProperties> GetProperties(
Azure::Response<Models::ShareServiceProperties> GetProperties(
const GetServicePropertiesOptions& options = GetServicePropertiesOptions(),
const Azure::Core::Context& context = Azure::Core::Context()) const;

4
sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
View File

@ -488,7 +488,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const Azure::Core::Context& context) const
{
auto protocolLayerOptions = _detail::ShareRestClient::File::UploadRangeOptions();
protocolLayerOptions.XMsWrite = Models::FileRangeWriteType::Update;
protocolLayerOptions.XMsWrite = _detail::FileRangeWriteType::Update;
protocolLayerOptions.ContentLength = content.Length();
protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset)
+ std::string("-") + std::to_string(offset + content.Length() - 1);
@ -510,7 +510,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const Azure::Core::Context& context) const
{
auto protocolLayerOptions = _detail::ShareRestClient::File::UploadRangeOptions();
protocolLayerOptions.XMsWrite = Models::FileRangeWriteType::Clear;
protocolLayerOptions.XMsWrite = _detail::FileRangeWriteType::Clear;
protocolLayerOptions.ContentLength = 0;
protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset)
+ std::string("-") + std::to_string(offset + length - 1);

4
sdk/storage/azure-storage-files-shares/src/share_responses.cpp
View File

@ -18,11 +18,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
m_status = Azure::Core::OperationStatus::Failed;
}
else if (response->CopyStatus.GetValue() == Models::CopyStatusType::Pending)
else if (response->CopyStatus.GetValue() == Models::CopyStatus::Pending)
{
m_status = Azure::Core::OperationStatus::Running;
}
else if (response->CopyStatus.GetValue() == Models::CopyStatusType::Success)
else if (response->CopyStatus.GetValue() == Models::CopyStatus::Success)
{
m_status = Azure::Core::OperationStatus::Succeeded;
}

65
sdk/storage/azure-storage-files-shares/src/share_rest_client.cpp
View File

@ -4,43 +4,46 @@
#include "azure/storage/files/shares/protocol/share_rest_client.hpp"
namespace Azure { namespace Storage { namespace Files { namespace Shares { namespace Models {
const ShareAccessTier ShareAccessTier::TransactionOptimized("TransactionOptimized");
const ShareAccessTier ShareAccessTier::Hot("Hot");
const ShareAccessTier ShareAccessTier::Cool("Cool");
const ShareAccessTier ShareAccessTier::Premium("Premium");
namespace Azure { namespace Storage { namespace Files { namespace Shares {
namespace Models {
const AccessTier AccessTier::TransactionOptimized("TransactionOptimized");
const AccessTier AccessTier::Hot("Hot");
const AccessTier AccessTier::Cool("Cool");
const AccessTier AccessTier::Premium("Premium");
const PermissionCopyModeType PermissionCopyModeType::Source("source");
const PermissionCopyModeType PermissionCopyModeType::Override("override");
const PermissionCopyModeType PermissionCopyModeType::Source("source");
const PermissionCopyModeType PermissionCopyModeType::Override("override");
const DeleteSnapshotsOptionType DeleteSnapshotsOptionType::Include("include");
const DeleteSnapshotsOptionType DeleteSnapshotsOptionType::Include("include");
const FileRangeWriteFromUrlType FileRangeWriteFromUrlType::Update("update");
const FileRangeWriteFromUrlType FileRangeWriteFromUrlType::Update("update");
const LeaseDurationType LeaseDurationType::Infinite("infinite");
const LeaseDurationType LeaseDurationType::Fixed("fixed");
const LeaseDurationType LeaseDurationType::Infinite("infinite");
const LeaseDurationType LeaseDurationType::Fixed("fixed");
const LeaseStateType LeaseStateType::Available("available");
const LeaseStateType LeaseStateType::Leased("leased");
const LeaseStateType LeaseStateType::Expired("expired");
const LeaseStateType LeaseStateType::Breaking("breaking");
const LeaseStateType LeaseStateType::Broken("broken");
const LeaseStateType LeaseStateType::Available("available");
const LeaseStateType LeaseStateType::Leased("leased");
const LeaseStateType LeaseStateType::Expired("expired");
const LeaseStateType LeaseStateType::Breaking("breaking");
const LeaseStateType LeaseStateType::Broken("broken");
const LeaseStatusType LeaseStatusType::Locked("locked");
const LeaseStatusType LeaseStatusType::Unlocked("unlocked");
const LeaseStatusType LeaseStatusType::Locked("locked");
const LeaseStatusType LeaseStatusType::Unlocked("unlocked");
const LeaseAction LeaseAction::Acquire("acquire");
const LeaseAction LeaseAction::Release("release");
const LeaseAction LeaseAction::Change("change");
const LeaseAction LeaseAction::Renew("renew");
const LeaseAction LeaseAction::Break("break");
const LeaseAction LeaseAction::Acquire("acquire");
const LeaseAction LeaseAction::Release("release");
const LeaseAction LeaseAction::Change("change");
const LeaseAction LeaseAction::Renew("renew");
const LeaseAction LeaseAction::Break("break");
const CopyStatusType CopyStatusType::Pending("pending");
const CopyStatusType CopyStatusType::Success("success");
const CopyStatusType CopyStatusType::Aborted("aborted");
const CopyStatusType CopyStatusType::Failed("failed");
const CopyStatus CopyStatus::Pending("pending");
const CopyStatus CopyStatus::Success("success");
const CopyStatus CopyStatus::Aborted("aborted");
const CopyStatus CopyStatus::Failed("failed");
const FileRangeWriteType FileRangeWriteType::Update("update");
const FileRangeWriteType FileRangeWriteType::Clear("clear");
}}}}} // namespace Azure::Storage::Files::Shares::Models
} // namespace Models
namespace _detail {
const FileRangeWriteType FileRangeWriteType::Update("update");
const FileRangeWriteType FileRangeWriteType::Clear("clear");
} // namespace _detail
}}}} // namespace Azure::Storage::Files::Shares

8
sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
View File

@ -96,7 +96,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
Azure::Response<Models::SetServicePropertiesResult> ShareServiceClient::SetProperties(
Models::FileServiceProperties properties,
Models::ShareServiceProperties properties,
const SetServicePropertiesOptions& options,
const Azure::Core::Context& context) const
{
@ -107,7 +107,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
m_serviceUrl, *m_pipeline, context, protocolLayerOptions);
}
Azure::Response<Models::FileServiceProperties> ShareServiceClient::GetProperties(
Azure::Response<Models::ShareServiceProperties> ShareServiceClient::GetProperties(
const GetServicePropertiesOptions& options,
const Azure::Core::Context& context) const
{
@ -115,12 +115,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
auto protocolLayerOptions = _detail::ShareRestClient::Service::GetPropertiesOptions();
auto result = _detail::ShareRestClient::Service::GetProperties(
m_serviceUrl, *m_pipeline, context, protocolLayerOptions);
Models::FileServiceProperties ret;
Models::ShareServiceProperties ret;
ret.Cors = std::move(result->Cors);
ret.HourMetrics = std::move(result->HourMetrics);
ret.MinuteMetrics = std::move(result->MinuteMetrics);
ret.Protocol = std::move(result->Protocol);
return Azure::Response<Models::FileServiceProperties>(
return Azure::Response<Models::ShareServiceProperties>(
std::move(ret), result.ExtractRawResponse());
}

37
sdk/storage/azure-storage-files-shares/test/share_client_test.cpp
View File

@ -373,11 +373,11 @@ namespace Azure { namespace Storage { namespace Test {
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
StandardStorageConnectionString(), shareName);
auto options = Files::Shares::CreateShareOptions();
options.AccessTier = Files::Shares::Models::ShareAccessTier::TransactionOptimized;
options.AccessTier = Files::Shares::Models::AccessTier::TransactionOptimized;
EXPECT_NO_THROW(shareClient.Create(options));
EXPECT_NO_THROW(properties = *shareClient.GetProperties());
EXPECT_EQ(
Files::Shares::Models::ShareAccessTier::TransactionOptimized,
Files::Shares::Models::AccessTier::TransactionOptimized,
properties.AccessTier.GetValue());
EXPECT_FALSE(properties.AccessTierTransitionState.HasValue());
EXPECT_TRUE(IsValidTime(properties.AccessTierChangedOn.GetValue()));
@ -388,10 +388,10 @@ namespace Azure { namespace Storage { namespace Test {
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
StandardStorageConnectionString(), shareName);
auto options = Files::Shares::CreateShareOptions();
options.AccessTier = Files::Shares::Models::ShareAccessTier::Hot;
options.AccessTier = Files::Shares::Models::AccessTier::Hot;
EXPECT_NO_THROW(shareClient.Create(options));
EXPECT_NO_THROW(properties = *shareClient.GetProperties());
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Hot, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Hot, properties.AccessTier.GetValue());
EXPECT_FALSE(properties.AccessTierTransitionState.HasValue());
EXPECT_EQ(properties.LastModified, properties.AccessTierChangedOn.GetValue());
shareClients.emplace(std::move(shareName), std::move(shareClient));
@ -401,10 +401,10 @@ namespace Azure { namespace Storage { namespace Test {
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
StandardStorageConnectionString(), shareName);
auto options = Files::Shares::CreateShareOptions();
options.AccessTier = Files::Shares::Models::ShareAccessTier::Cool;
options.AccessTier = Files::Shares::Models::AccessTier::Cool;
EXPECT_NO_THROW(shareClient.Create(options));
EXPECT_NO_THROW(properties = *shareClient.GetProperties());
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Cool, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Cool, properties.AccessTier.GetValue());
EXPECT_FALSE(properties.AccessTierTransitionState.HasValue());
EXPECT_EQ(properties.LastModified, properties.AccessTierChangedOn.GetValue());
shareClients.emplace(std::move(shareName), std::move(shareClient));
@ -415,23 +415,23 @@ namespace Azure { namespace Storage { namespace Test {
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
StandardStorageConnectionString(), LowercaseRandomString(10));
auto options = Files::Shares::CreateShareOptions();
options.AccessTier = Files::Shares::Models::ShareAccessTier::Cool;
options.AccessTier = Files::Shares::Models::AccessTier::Cool;
EXPECT_NO_THROW(shareClient.Create(options));
EXPECT_EQ(
Files::Shares::Models::ShareAccessTier::Cool,
Files::Shares::Models::AccessTier::Cool,
shareClient.GetProperties()->AccessTier.GetValue());
auto setPropertiesOptions = Files::Shares::SetSharePropertiesOptions();
setPropertiesOptions.AccessTier = Files::Shares::Models::ShareAccessTier::Hot;
setPropertiesOptions.AccessTier = Files::Shares::Models::AccessTier::Hot;
EXPECT_NO_THROW(shareClient.SetProperties(setPropertiesOptions));
properties = *shareClient.GetProperties();
if (properties.AccessTierTransitionState.HasValue())
{
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Cool, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Cool, properties.AccessTier.GetValue());
}
else
{
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Hot, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Hot, properties.AccessTier.GetValue());
}
EXPECT_EQ(properties.LastModified, properties.AccessTierChangedOn.GetValue());
}
@ -472,7 +472,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_NO_THROW(shareClient.Create());
Files::Shares::Models::ShareProperties properties;
EXPECT_NO_THROW(properties = *shareClient.GetProperties());
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Premium, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Premium, properties.AccessTier.GetValue());
EXPECT_FALSE(properties.AccessTierTransitionState.HasValue());
EXPECT_FALSE(properties.AccessTierChangedOn.HasValue());
@ -484,21 +484,20 @@ namespace Azure { namespace Storage { namespace Test {
->Items;
EXPECT_EQ(1U, shareItems.size());
EXPECT_EQ(
Files::Shares::Models::ShareAccessTier::Premium,
shareItems[0].Details.AccessTier.GetValue());
Files::Shares::Models::AccessTier::Premium, shareItems[0].Details.AccessTier.GetValue());
EXPECT_FALSE(shareItems[0].Details.AccessTierTransitionState.HasValue());
EXPECT_FALSE(shareItems[0].Details.AccessTierChangedOn.HasValue());
auto setPropertiesOptions = Files::Shares::SetSharePropertiesOptions();
setPropertiesOptions.AccessTier = Files::Shares::Models::ShareAccessTier::Hot;
setPropertiesOptions.AccessTier = Files::Shares::Models::AccessTier::Hot;
EXPECT_THROW(shareClient.SetProperties(setPropertiesOptions), StorageException);
setPropertiesOptions.AccessTier = Files::Shares::Models::ShareAccessTier::Cool;
setPropertiesOptions.AccessTier = Files::Shares::Models::AccessTier::Cool;
EXPECT_THROW(shareClient.SetProperties(setPropertiesOptions), StorageException);
setPropertiesOptions.AccessTier = Files::Shares::Models::ShareAccessTier::TransactionOptimized;
setPropertiesOptions.AccessTier = Files::Shares::Models::AccessTier::TransactionOptimized;
EXPECT_THROW(shareClient.SetProperties(setPropertiesOptions), StorageException);
setPropertiesOptions.AccessTier = Files::Shares::Models::ShareAccessTier::Premium;
setPropertiesOptions.AccessTier = Files::Shares::Models::AccessTier::Premium;
EXPECT_NO_THROW(shareClient.SetProperties(setPropertiesOptions));
EXPECT_EQ(Files::Shares::Models::ShareAccessTier::Premium, properties.AccessTier.GetValue());
EXPECT_EQ(Files::Shares::Models::AccessTier::Premium, properties.AccessTier.GetValue());
EXPECT_FALSE(properties.AccessTierTransitionState.HasValue());
EXPECT_FALSE(properties.AccessTierChangedOn.HasValue());
}

3
sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
View File

@ -683,8 +683,7 @@ namespace Azure { namespace Storage { namespace Test {
copyOperation.GetRawResponse().GetStatusCode(),
Azure::Core::Http::HttpStatusCode::Accepted);
auto fileProperties = *copyOperation.PollUntilDone(std::chrono::milliseconds(1000));
EXPECT_EQ(
fileProperties.CopyStatus.GetValue(), Files::Shares::Models::CopyStatusType::Success);
EXPECT_EQ(fileProperties.CopyStatus.GetValue(), Files::Shares::Models::CopyStatus::Success);
}
{

4
sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp
View File

@ -153,7 +153,7 @@ namespace Azure { namespace Storage { namespace Test {
{
auto properties = *m_fileShareServiceClient->GetProperties();
// Has to remove before set, otherwise would return failure.
properties.Protocol = Azure::Nullable<Files::Shares::Models::ShareProtocolSettings>();
properties.Protocol = Azure::Nullable<Files::Shares::Models::ProtocolSettings>();
auto originalProperties = properties;
properties.HourMetrics.Enabled = true;
@ -273,7 +273,7 @@ namespace Azure { namespace Storage { namespace Test {
corsRule.MaxAgeInSeconds = 20;
properties.Cors.emplace_back(corsRule);
auto protocolSettings = Files::Shares::Models::ShareProtocolSettings();
auto protocolSettings = Files::Shares::Models::ProtocolSettings();
protocolSettings.Settings.Multichannel.Enabled = true;
properties.Protocol = protocolSettings;