diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index d1ce13e6e..1bfa0d6f1 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -153,11 +153,6 @@ jobs: } displayName: Copy CHANGELOG.md to package artifact - - task: PublishPipelineArtifact@1 - inputs: - artifactName: packages - path: $(Build.ArtifactStagingDirectory)/packages - - script: cmake --build . --target ${{ artifact.Name }}-docs workingDirectory: build displayName: Generate docs (${{ artifact.Name }}-docs) @@ -178,6 +173,11 @@ jobs: targetFolder: $(Build.ArtifactStagingDirectory)/docs/${{ artifact.Name }} displayName: Copy documentation to artifact staging directory + - task: PublishPipelineArtifact@1 + inputs: + artifactName: packages + path: $(Build.ArtifactStagingDirectory)/packages + # After all docs artifacts are generated publis docs artifacts - task: PublishPipelineArtifact@1 inputs: diff --git a/sdk/storage/CMakeLists.txt b/sdk/storage/CMakeLists.txt index 52e42c642..e5799b67f 100644 --- a/sdk/storage/CMakeLists.txt +++ b/sdk/storage/CMakeLists.txt @@ -8,174 +8,32 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -option(BUILD_STORAGE_SAMPLES "Build sample codes" ON) +option(BUILD_STORAGE_SAMPLES "Build storage sample codes" ON) + if(MSVC) add_compile_definitions(NOMINMAX) endif() -set(AZURE_STORAGE_COMMON_HEADER - inc/common/access_conditions.hpp - inc/common/storage_per_retry_policy.hpp - inc/common/concurrent_transfer.hpp - inc/common/constants.hpp - inc/common/crypt.hpp - inc/common/file_io.hpp - inc/common/reliable_stream.hpp - inc/common/shared_key_policy.hpp - inc/common/storage_common.hpp - inc/common/storage_credential.hpp - inc/common/storage_error.hpp - inc/common/storage_uri_builder.hpp - inc/common/storage_version.hpp - inc/common/xml_wrapper.hpp - inc/common/account_sas_builder.hpp -) - -set(AZURE_STORAGE_COMMON_SOURCE - src/common/storage_per_retry_policy.cpp - src/common/crypt.cpp - src/common/file_io.cpp - src/common/reliable_stream.cpp - src/common/shared_key_policy.cpp - src/common/storage_common.cpp - src/common/storage_credential.cpp - src/common/storage_error.cpp - src/common/storage_uri_builder.cpp - src/common/xml_wrapper.cpp - src/common/account_sas_builder.cpp -) - -add_library(azure-storage-common ${AZURE_STORAGE_COMMON_HEADER} ${AZURE_STORAGE_COMMON_SOURCE}) - -set(CMAKE_THREAD_PREFER_PTHREAD TRUE) -set(THREADS_PREFER_PTHREAD_FLAG TRUE) -find_package(Threads REQUIRED) -find_package(LibXml2 REQUIRED) - -target_include_directories(azure-storage-common PUBLIC ${LIBXML2_INCLUDE_DIR} $ $ $) -target_link_libraries(azure-storage-common Threads::Threads azure-core ${LIBXML2_LIBRARIES}) - -if(MSVC) - target_link_libraries(azure-storage-common bcrypt) - # C28020 and C28204 are introduced by nlohmann/json - target_compile_options(azure-storage-common PUBLIC /wd28204 /wd28020) -else() - find_package(OpenSSL REQUIRED) - target_link_libraries(azure-storage-common OpenSSL::SSL OpenSSL::Crypto) -endif() - -file(READ "inc/common/storage_version.hpp" VERSION_FILE_CONTENT) - -string(REGEX MATCH "CommonComponentVersion = \"([^\"]*)" _ ${VERSION_FILE_CONTENT}) -if ("${CMAKE_MATCH_1}" STREQUAL "") - message(FATAL_ERROR "Failed to get Common component version") -endif() -set(COMMON_COMPONENT_VERSION ${CMAKE_MATCH_1}) -message("Common component version ${COMMON_COMPONENT_VERSION}") - -string(REGEX MATCH "BlobServiceVersion = \"([^\"]*)" _ ${VERSION_FILE_CONTENT}) -if ("${CMAKE_MATCH_1}" STREQUAL "") - message(FATAL_ERROR "Failed to get Blob service version") -endif() -set(BLOB_SERVICE_VERSION ${CMAKE_MATCH_1}) -message("Blob service version ${BLOB_SERVICE_VERSION}") - -string(REGEX MATCH "DataLakeServiceVersion = \"([^\"]*)" _ ${VERSION_FILE_CONTENT}) -if ("${CMAKE_MATCH_1}" STREQUAL "") - message(FATAL_ERROR "Failed to get DataLake service version") -endif() -set(DATALAKE_SERVICE_VERSION ${CMAKE_MATCH_1}) -message("DataLake service version ${DATALAKE_SERVICE_VERSION}") - -set (AZURE_STORAGE_BLOB_HEADER - inc/blobs/blob.hpp - inc/blobs/blob_service_client.hpp - inc/blobs/blob_container_client.hpp - inc/blobs/blob_client.hpp - inc/blobs/block_blob_client.hpp - inc/blobs/page_blob_client.hpp - inc/blobs/append_blob_client.hpp - inc/blobs/blob_options.hpp - inc/blobs/blob_responses.hpp - inc/blobs/blob_sas_builder.hpp - inc/blobs/protocol/blob_rest_client.hpp -) - -set (AZURE_STORAGE_BLOB_SOURCE - src/blobs/blob_service_client.cpp - src/blobs/blob_container_client.cpp - src/blobs/blob_client.cpp - src/blobs/block_blob_client.cpp - src/blobs/page_blob_client.cpp - src/blobs/append_blob_client.cpp - src/blobs/blob_sas_builder.cpp -) - -add_library(azure-storage-blob ${AZURE_STORAGE_BLOB_HEADER} ${AZURE_STORAGE_BLOB_SOURCE}) -target_link_libraries(azure-storage-blob azure-storage-common) - -set (AZURE_STORAGE_DATALAKE_HEADER - inc/datalake/datalake.hpp - inc/datalake/protocol/datalake_rest_client.hpp - inc/datalake/datalake_responses.hpp - inc/datalake/datalake_options.hpp - inc/datalake/datalake_utilities.hpp - inc/datalake/datalake_service_client.hpp - inc/datalake/datalake_file_system_client.hpp - inc/datalake/datalake_path_client.hpp - inc/datalake/datalake_file_client.hpp - inc/datalake/datalake_directory_client.hpp -) - -set (AZURE_STORAGE_DATALAKE_SOURCE - src/datalake/datalake_service_client.cpp - src/datalake/datalake_file_system_client.cpp - src/datalake/datalake_path_client.cpp - src/datalake/datalake_file_client.cpp - src/datalake/datalake_directory_client.cpp - src/datalake/datalake_utilities.cpp - src/datalake/datalake_responses.cpp -) - -add_library(azure-storage-file-datalake ${AZURE_STORAGE_DATALAKE_HEADER} ${AZURE_STORAGE_DATALAKE_SOURCE}) -target_link_libraries(azure-storage-file-datalake azure-storage-blob) - -set (AZURE_STORAGE_SHARES_HEADER - inc/shares/shares.hpp - inc/shares/protocol/share_rest_client.hpp - inc/shares/share_constants.hpp - inc/shares/share_file_attribute.hpp - inc/shares/share_options.hpp - inc/shares/share_responses.hpp - inc/shares/share_service_client.hpp - inc/shares/share_client.hpp - inc/shares/share_directory_client.hpp - inc/shares/share_file_client.hpp -) - -set (AZURE_STORAGE_SHARES_SOURCE - src/shares/share_service_client.cpp - src/shares/share_client.cpp - src/shares/share_directory_client.cpp - src/shares/share_file_client.cpp -) - -add_library(azure-storage-file-share ${AZURE_STORAGE_SHARES_HEADER} ${AZURE_STORAGE_SHARES_SOURCE}) -target_link_libraries(azure-storage-file-share azure-storage-common) - -add_library(azure::storage::common ALIAS azure-storage-common) -add_library(azure::storage::blob ALIAS azure-storage-blob) -add_library(azure::storage::file::datalake ALIAS azure-storage-file-datalake) -add_library(azure::storage::file::share ALIAS azure-storage-file-share) - -if(BUILD_STORAGE_SAMPLES) - add_subdirectory(sample) -endif() +add_executable(azure-storage-test) if(BUILD_TESTING) - add_subdirectory(test) + set_target_properties(azure-storage-test PROPERTIES EXCLUDE_FROM_ALL FALSE) + add_gtest(azure-storage-test) +else() + set_target_properties(azure-storage-test PROPERTIES EXCLUDE_FROM_ALL TRUE) endif() -# TODO: eng/sys teams is going to fix this -generate_documentation(azure-storage 1.0.0-preview.1) + +add_executable(azure-storage-sample) +if(BUILD_STORAGE_SAMPLES) + set_target_properties(azure-storage-sample PROPERTIES EXCLUDE_FROM_ALL FALSE) +else() + set_target_properties(azure-storage-sample PROPERTIES EXCLUDE_FROM_ALL TRUE) +endif() + + +add_subdirectory(azure-storage-common) +add_subdirectory(azure-storage-blobs) +add_subdirectory(azure-storage-files-datalake) +add_subdirectory(azure-storage-files-shares) diff --git a/sdk/storage/README.md b/sdk/storage/README.md index 656f49c2e..afb1f9e63 100644 --- a/sdk/storage/README.md +++ b/sdk/storage/README.md @@ -40,7 +40,7 @@ For general suggestions about Azure, use our [Azure feedback forum](http://feedb #### Windows -On Windows, dependencies are managed by [Vcpkg](https://github.com/microsoft/vcpkg). You can reference the [Quick Start](https://github.com/microsoft/vcpkg#quick-start-windows) to quickly set yourself up. +On Windows, dependencies are managed by [vcpkg](https://github.com/microsoft/vcpkg). You can reference the [Quick Start](https://github.com/microsoft/vcpkg#quick-start-windows) to quickly set yourself up. After Vcpkg is initialized and bootstrapped, you can install the dependencies: ```BatchFile vcpkg.exe install libxml2:x64-windows curl:x64-windows @@ -68,7 +68,7 @@ git clone https://github.com/Azure/azure-sdk-for-cpp.git In a new folder you created under the root directory: ```BatchFile -cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE=/scripts/buildsystems/vcpkg.cmake -DBUILD_STORAGE_SAMPLES=ON +cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE=/scripts/buildsystems/vcpkg.cmake cmake --build . ``` @@ -86,7 +86,7 @@ The libraries will be in `\out\build\\sdk\ diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp new file mode 100644 index 000000000..ba827479a --- /dev/null +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT + +#pragma once + +#include "azure/storage/blobs/append_blob_client.hpp" +#include "azure/storage/blobs/blob_client.hpp" +#include "azure/storage/blobs/blob_container_client.hpp" +#include "azure/storage/blobs/blob_service_client.hpp" +#include "azure/storage/blobs/block_blob_client.hpp" +#include "azure/storage/blobs/page_blob_client.hpp" diff --git a/sdk/storage/inc/blobs/blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp similarity index 98% rename from sdk/storage/inc/blobs/blob_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp index 66751b3c8..da3753033 100644 --- a/sdk/storage/inc/blobs/blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp @@ -3,12 +3,12 @@ #pragma once -#include "blob_options.hpp" -#include "blob_responses.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/blobs/blob_responses.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/inc/blobs/blob_container_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp similarity index 98% rename from sdk/storage/inc/blobs/blob_container_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp index 6357475fc..ca4cdf7db 100644 --- a/sdk/storage/inc/blobs/blob_container_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp @@ -3,12 +3,12 @@ #pragma once -#include "blob_options.hpp" -#include "blobs/blob_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/blob_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/inc/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp similarity index 99% rename from sdk/storage/inc/blobs/blob_options.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp index 93d712790..7d5409e96 100644 --- a/sdk/storage/inc/blobs/blob_options.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp @@ -3,8 +3,8 @@ #pragma once -#include "common/access_conditions.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/access_conditions.hpp" #include #include diff --git a/sdk/storage/inc/blobs/blob_responses.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp similarity index 95% rename from sdk/storage/inc/blobs/blob_responses.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp index 290582e67..3bf5ddd0d 100644 --- a/sdk/storage/inc/blobs/blob_responses.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp @@ -3,7 +3,7 @@ #pragma once -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/blobs/blob_sas_builder.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp similarity index 98% rename from sdk/storage/inc/blobs/blob_sas_builder.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp index 69d368672..4b5869fa7 100644 --- a/sdk/storage/inc/blobs/blob_sas_builder.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp @@ -5,10 +5,10 @@ #include -#include "blobs/blob_responses.hpp" -#include "blobs/protocol/blob_rest_client.hpp" -#include "common/account_sas_builder.hpp" #include "azure/core/nullable.hpp" +#include "azure/storage/blobs/blob_responses.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/account_sas_builder.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/inc/blobs/blob_service_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp similarity index 96% rename from sdk/storage/inc/blobs/blob_service_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp index 4743714a9..8b516a71e 100644 --- a/sdk/storage/inc/blobs/blob_service_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp @@ -3,12 +3,12 @@ #pragma once -#include "blob_options.hpp" -#include "blobs/blob_container_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/blob_container_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/inc/blobs/block_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp similarity index 98% rename from sdk/storage/inc/blobs/block_blob_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp index 71e02eed7..288e2467e 100644 --- a/sdk/storage/inc/blobs/block_blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp @@ -3,11 +3,11 @@ #pragma once -#include "blob_options.hpp" -#include "blobs/blob_client.hpp" -#include "common/storage_credential.hpp" #include "azure/core/credentials/credentials.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/blob_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/storage_credential.hpp" #include #include diff --git a/sdk/storage/inc/blobs/page_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp similarity index 97% rename from sdk/storage/inc/blobs/page_blob_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp index 8eee8c0b1..dc5c12f57 100644 --- a/sdk/storage/inc/blobs/page_blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp @@ -3,12 +3,12 @@ #pragma once -#include "blob_options.hpp" -#include "blob_responses.hpp" -#include "blobs/blob_client.hpp" -#include "common/storage_credential.hpp" #include "azure/core/credentials/credentials.hpp" -#include "protocol/blob_rest_client.hpp" +#include "azure/storage/blobs/blob_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/blobs/blob_responses.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/storage_credential.hpp" #include diff --git a/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp similarity index 99% rename from sdk/storage/inc/blobs/protocol/blob_rest_client.hpp rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp index 52ee5fe91..d2751585e 100644 --- a/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp @@ -3,14 +3,14 @@ #pragma once -#include "common/storage_common.hpp" -#include "common/storage_error.hpp" -#include "common/xml_wrapper.hpp" #include "azure/core/context.hpp" #include "azure/core/http/http.hpp" #include "azure/core/http/pipeline.hpp" #include "azure/core/nullable.hpp" #include "azure/core/response.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/xml_wrapper.hpp" #include #include diff --git a/sdk/storage/sample/blob_getting_started.cpp b/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp similarity index 97% rename from sdk/storage/sample/blob_getting_started.cpp rename to sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp index 4b7a054c3..be75d22fe 100644 --- a/sdk/storage/sample/blob_getting_started.cpp +++ b/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob.hpp" -#include "samples_common.hpp" - #include +#include "azure/storage/blobs/blob.hpp" +#include "samples_common.hpp" + SAMPLE(BlobsGettingStarted, BlobsGettingStarted) void BlobsGettingStarted() { diff --git a/sdk/storage/src/blobs/append_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp similarity index 98% rename from sdk/storage/src/blobs/append_blob_client.cpp rename to sdk/storage/azure-storage-blobs/src/append_blob_client.cpp index b659f8ed5..b3cd61401 100644 --- a/sdk/storage/src/blobs/append_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/append_blob_client.hpp" +#include "azure/storage/blobs/append_blob_client.hpp" -#include "common/constants.hpp" -#include "common/storage_common.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/storage_common.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp similarity index 97% rename from sdk/storage/src/blobs/blob_client.cpp rename to sdk/storage/azure-storage-blobs/src/blob_client.cpp index 1195d4366..33d5097c4 100644 --- a/sdk/storage/src/blobs/blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob_client.hpp" +#include "azure/storage/blobs/blob_client.hpp" -#include "blobs/append_blob_client.hpp" -#include "blobs/block_blob_client.hpp" -#include "blobs/page_blob_client.hpp" -#include "common/concurrent_transfer.hpp" -#include "common/constants.hpp" -#include "common/file_io.hpp" -#include "common/reliable_stream.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/blobs/append_blob_client.hpp" +#include "azure/storage/blobs/block_blob_client.hpp" +#include "azure/storage/blobs/page_blob_client.hpp" +#include "azure/storage/common/concurrent_transfer.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/file_io.hpp" +#include "azure/storage/common/reliable_stream.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_container_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp similarity index 96% rename from sdk/storage/src/blobs/blob_container_client.cpp rename to sdk/storage/azure-storage-blobs/src/blob_container_client.cpp index 3f44c8246..a1eb26cf0 100644 --- a/sdk/storage/src/blobs/blob_container_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob_container_client.hpp" +#include "azure/storage/blobs/blob_container_client.hpp" -#include "blobs/append_blob_client.hpp" -#include "blobs/block_blob_client.hpp" -#include "blobs/page_blob_client.hpp" -#include "common/constants.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/blobs/append_blob_client.hpp" +#include "azure/storage/blobs/block_blob_client.hpp" +#include "azure/storage/blobs/page_blob_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_sas_builder.cpp b/sdk/storage/azure-storage-blobs/src/blob_sas_builder.cpp similarity index 98% rename from sdk/storage/src/blobs/blob_sas_builder.cpp rename to sdk/storage/azure-storage-blobs/src/blob_sas_builder.cpp index c19c6f176..73306c7c0 100644 --- a/sdk/storage/src/blobs/blob_sas_builder.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_sas_builder.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob_sas_builder.hpp" -#include "common/crypt.hpp" -#include "common/storage_uri_builder.hpp" +#include "azure/storage/blobs/blob_sas_builder.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_service_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp similarity index 95% rename from sdk/storage/src/blobs/blob_service_client.cpp rename to sdk/storage/azure-storage-blobs/src/blob_service_client.cpp index 33aba94a9..01afebd46 100644 --- a/sdk/storage/src/blobs/blob_service_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob_service_client.hpp" +#include "azure/storage/blobs/blob_service_client.hpp" -#include "common/constants.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/block_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp similarity index 98% rename from sdk/storage/src/blobs/block_blob_client.cpp rename to sdk/storage/azure-storage-blobs/src/block_blob_client.cpp index 47ccda067..1fd312fe4 100644 --- a/sdk/storage/src/blobs/block_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/block_blob_client.hpp" +#include "azure/storage/blobs/block_blob_client.hpp" -#include "common/concurrent_transfer.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/file_io.hpp" -#include "common/storage_common.hpp" +#include "azure/storage/common/concurrent_transfer.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/file_io.hpp" +#include "azure/storage/common/storage_common.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/page_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp similarity index 98% rename from sdk/storage/src/blobs/page_blob_client.cpp rename to sdk/storage/azure-storage-blobs/src/page_blob_client.cpp index c02f60a01..451c2956e 100644 --- a/sdk/storage/src/blobs/page_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/page_blob_client.hpp" +#include "azure/storage/blobs/page_blob_client.hpp" -#include "common/concurrent_transfer.hpp" -#include "common/constants.hpp" -#include "common/file_io.hpp" -#include "common/storage_common.hpp" +#include "azure/storage/common/concurrent_transfer.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/file_io.hpp" +#include "azure/storage/common/storage_common.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/test/blobs/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp similarity index 100% rename from sdk/storage/test/blobs/append_blob_client_test.cpp rename to sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp diff --git a/sdk/storage/test/blobs/append_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp similarity index 94% rename from sdk/storage/test/blobs/append_blob_client_test.hpp rename to sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp index c14f4871c..3018dcdc2 100644 --- a/sdk/storage/test/blobs/append_blob_client_test.hpp +++ b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/blobs/blob.hpp" #include "blob_container_client_test.hpp" -#include "blobs/blob.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp similarity index 99% rename from sdk/storage/test/blobs/blob_container_client_test.cpp rename to sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp index 086cdaf09..0d8156ce6 100644 --- a/sdk/storage/test/blobs/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: MIT #include "blob_container_client_test.hpp" -#include "blobs/blob_sas_builder.hpp" -#include "common/crypt.hpp" +#include "azure/storage/blobs/blob_sas_builder.hpp" +#include "azure/storage/common/crypt.hpp" #include #include diff --git a/sdk/storage/test/blobs/blob_container_client_test.hpp b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp similarity index 93% rename from sdk/storage/test/blobs/blob_container_client_test.hpp rename to sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp index 6e2834751..cad9c18fa 100644 --- a/sdk/storage/test/blobs/blob_container_client_test.hpp +++ b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob.hpp" +#include "azure/storage/blobs/blob.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/blob_sas_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp similarity index 99% rename from sdk/storage/test/blobs/blob_sas_test.cpp rename to sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp index 7ae29f839..b4acc2ff2 100644 --- a/sdk/storage/test/blobs/blob_sas_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/blobs/blob_sas_builder.hpp" #include "blob_container_client_test.hpp" -#include "blobs/blob_sas_builder.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp similarity index 99% rename from sdk/storage/test/blobs/blob_service_client_test.cpp rename to sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp index 897423cdf..dd0f04713 100644 --- a/sdk/storage/test/blobs/blob_service_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob.hpp" +#include "azure/storage/blobs/blob.hpp" #include "test_base.hpp" #include diff --git a/sdk/storage/test/blobs/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp similarity index 99% rename from sdk/storage/test/blobs/block_blob_client_test.cpp rename to sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp index 0bba98cc3..c2c4b2074 100644 --- a/sdk/storage/test/blobs/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp @@ -3,8 +3,8 @@ #include "block_blob_client_test.hpp" -#include "common/crypt.hpp" -#include "common/file_io.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/file_io.hpp" #include #include diff --git a/sdk/storage/test/blobs/block_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp similarity index 94% rename from sdk/storage/test/blobs/block_blob_client_test.hpp rename to sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp index 139ab0dd4..12e1f8050 100644 --- a/sdk/storage/test/blobs/block_blob_client_test.hpp +++ b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/blobs/blob.hpp" #include "blob_container_client_test.hpp" -#include "blobs/blob.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/large_scale_test.cpp b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp similarity index 95% rename from sdk/storage/test/blobs/large_scale_test.cpp rename to sdk/storage/azure-storage-blobs/test/large_scale_test.cpp index 68ac440d9..018b1c95e 100644 --- a/sdk/storage/test/blobs/large_scale_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob.hpp" -#include "common/file_io.hpp" +#include "azure/storage/blobs/blob.hpp" +#include "azure/storage/common/file_io.hpp" #include "test_base.hpp" #include diff --git a/sdk/storage/test/blobs/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp similarity index 99% rename from sdk/storage/test/blobs/page_blob_client_test.cpp rename to sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp index 95858dc10..66a7b61df 100644 --- a/sdk/storage/test/blobs/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp @@ -6,8 +6,8 @@ #include #include -#include "common/crypt.hpp" -#include "common/file_io.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/file_io.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/page_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp similarity index 94% rename from sdk/storage/test/blobs/page_blob_client_test.hpp rename to sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp index 022dea954..16228c3d8 100644 --- a/sdk/storage/test/blobs/page_blob_client_test.hpp +++ b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/blobs/blob.hpp" #include "blob_container_client_test.hpp" -#include "blobs/blob.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/blobs/performance_benchmark.cpp b/sdk/storage/azure-storage-blobs/test/performance_benchmark.cpp similarity index 100% rename from sdk/storage/test/blobs/performance_benchmark.cpp rename to sdk/storage/azure-storage-blobs/test/performance_benchmark.cpp diff --git a/sdk/storage/azure-storage-blobs/version.txt b/sdk/storage/azure-storage-blobs/version.txt new file mode 100644 index 000000000..ebb5fbf54 --- /dev/null +++ b/sdk/storage/azure-storage-blobs/version.txt @@ -0,0 +1 @@ +1.0.0-beta.1 \ No newline at end of file diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt new file mode 100644 index 000000000..f264b7171 --- /dev/null +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -0,0 +1,87 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT + +cmake_minimum_required (VERSION 3.15) + +set(AZURE_STORAGE_COMMON_HEADER + inc/azure/storage/common/access_conditions.hpp + inc/azure/storage/common/account_sas_builder.hpp + inc/azure/storage/common/concurrent_transfer.hpp + inc/azure/storage/common/constants.hpp + inc/azure/storage/common/crypt.hpp + inc/azure/storage/common/file_io.hpp + inc/azure/storage/common/json.hpp + inc/azure/storage/common/reliable_stream.hpp + inc/azure/storage/common/shared_key_policy.hpp + inc/azure/storage/common/storage_common.hpp + inc/azure/storage/common/storage_credential.hpp + inc/azure/storage/common/storage_error.hpp + inc/azure/storage/common/storage_per_retry_policy.hpp + inc/azure/storage/common/storage_uri_builder.hpp + inc/azure/storage/common/storage_version.hpp + inc/azure/storage/common/xml_wrapper.hpp +) + +set(AZURE_STORAGE_COMMON_SOURCE + src/account_sas_builder.cpp + src/crypt.cpp + src/file_io.cpp + src/reliable_stream.cpp + src/shared_key_policy.cpp + src/storage_common.cpp + src/storage_credential.cpp + src/storage_error.cpp + src/storage_per_retry_policy.cpp + src/storage_uri_builder.cpp + src/storage_version.cpp + src/xml_wrapper.cpp +) + +add_library(azure-storage-common ${AZURE_STORAGE_COMMON_HEADER} ${AZURE_STORAGE_COMMON_SOURCE}) + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +set(THREADS_PREFER_PTHREAD_FLAG TRUE) +find_package(Threads REQUIRED) +find_package(LibXml2 REQUIRED) + +target_include_directories(azure-storage-common PUBLIC inc ${LIBXML2_INCLUDE_DIR}) +target_link_libraries(azure-storage-common Threads::Threads azure-core ${LIBXML2_LIBRARIES}) +if(MSVC) + target_link_libraries(azure-storage-common bcrypt) + # C28020 and C28204 are introduced by nlohmann/json + target_compile_options(azure-storage-common PUBLIC /wd28204 /wd28020) +else() + find_package(OpenSSL REQUIRED) + target_link_libraries(azure-storage-common OpenSSL::SSL OpenSSL::Crypto) +endif() +file(READ version.txt AZURE_STORAGE_COMMON_PACKAGE_VERSION) +target_compile_definitions(azure-storage-common PUBLIC AZURE_STORAGE_COMMON_PACKAGE_VERSION="${AZURE_STORAGE_COMMON_PACKAGE_VERSION}") +message("Azure Storage Common Package Version ${AZURE_STORAGE_COMMON_PACKAGE_VERSION}") +add_library(azure::storage::common ALIAS azure-storage-common) + + +target_sources( + azure-storage-test + PRIVATE + test/bearer_token_test.cpp + test/crypt_functions_test.cpp + test/test_base.cpp + test/test_base.hpp +) + +target_include_directories(azure-storage-test PUBLIC test) +if (MSVC) + target_compile_options(azure-storage-test PUBLIC /wd6326 /wd26495 /wd26812) +endif() + + +target_sources( + azure-storage-sample + PRIVATE + sample/main.cpp + sample/samples_common.hpp +) + +target_include_directories(azure-storage-sample PUBLIC sample) + +generate_documentation(azure-storage-common ${AZURE_STORAGE_COMMON_PACKAGE_VERSION}) diff --git a/sdk/storage/inc/common/access_conditions.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp similarity index 100% rename from sdk/storage/inc/common/access_conditions.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp diff --git a/sdk/storage/inc/common/account_sas_builder.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp similarity index 98% rename from sdk/storage/inc/common/account_sas_builder.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp index e72c38f9d..7d1b24470 100644 --- a/sdk/storage/inc/common/account_sas_builder.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp @@ -5,9 +5,9 @@ #include -#include "common/constants.hpp" -#include "common/storage_credential.hpp" #include "azure/core/nullable.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/storage_credential.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/inc/common/concurrent_transfer.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/concurrent_transfer.hpp similarity index 100% rename from sdk/storage/inc/common/concurrent_transfer.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/concurrent_transfer.hpp diff --git a/sdk/storage/inc/common/constants.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/constants.hpp similarity index 100% rename from sdk/storage/inc/common/constants.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/constants.hpp diff --git a/sdk/storage/inc/common/crypt.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp similarity index 100% rename from sdk/storage/inc/common/crypt.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp diff --git a/sdk/storage/inc/common/file_io.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/file_io.hpp similarity index 100% rename from sdk/storage/inc/common/file_io.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/file_io.hpp diff --git a/sdk/storage/external/json.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/json.hpp similarity index 100% rename from sdk/storage/external/json.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/json.hpp diff --git a/sdk/storage/inc/common/reliable_stream.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/reliable_stream.hpp similarity index 100% rename from sdk/storage/inc/common/reliable_stream.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/reliable_stream.hpp diff --git a/sdk/storage/inc/common/shared_key_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp similarity index 95% rename from sdk/storage/inc/common/shared_key_policy.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp index c4f3421f6..fd71ac1dd 100644 --- a/sdk/storage/inc/common/shared_key_policy.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp @@ -3,8 +3,8 @@ #pragma once -#include "common/storage_credential.hpp" #include "azure/core/http/policy.hpp" +#include "azure/storage/common/storage_credential.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/inc/common/storage_common.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp similarity index 100% rename from sdk/storage/inc/common/storage_common.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp diff --git a/sdk/storage/inc/common/storage_credential.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp similarity index 96% rename from sdk/storage/inc/common/storage_credential.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp index 5c6f56871..988780b17 100644 --- a/sdk/storage/inc/common/storage_credential.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp @@ -3,7 +3,7 @@ #pragma once -#include "common/storage_uri_builder.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/inc/common/storage_error.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_error.hpp similarity index 100% rename from sdk/storage/inc/common/storage_error.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_error.hpp diff --git a/sdk/storage/inc/common/storage_per_retry_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_per_retry_policy.hpp similarity index 100% rename from sdk/storage/inc/common/storage_per_retry_policy.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_per_retry_policy.hpp diff --git a/sdk/storage/inc/common/storage_uri_builder.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_uri_builder.hpp similarity index 100% rename from sdk/storage/inc/common/storage_uri_builder.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_uri_builder.hpp diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_version.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_version.hpp new file mode 100644 index 000000000..65d106c13 --- /dev/null +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_version.hpp @@ -0,0 +1,13 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT + +#pragma once + +namespace Azure { namespace Storage { + + extern const char* CommonComponentVersion; + extern const char* BlobServiceVersion; + extern const char* DataLakeServiceVersion; + extern const char* FileServiceVersion; + +}} // namespace Azure::Storage diff --git a/sdk/storage/inc/common/xml_wrapper.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp similarity index 100% rename from sdk/storage/inc/common/xml_wrapper.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp diff --git a/sdk/storage/sample/main.cpp b/sdk/storage/azure-storage-common/sample/main.cpp similarity index 100% rename from sdk/storage/sample/main.cpp rename to sdk/storage/azure-storage-common/sample/main.cpp index 7bb1f893a..e6a797d1b 100644 --- a/sdk/storage/sample/main.cpp +++ b/sdk/storage/azure-storage-common/sample/main.cpp @@ -5,11 +5,11 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "samples_common.hpp" - #include #include +#include "samples_common.hpp" + const std::string& GetConnectionString() { const static std::string c_ConnectionString = ""; diff --git a/sdk/storage/sample/samples_common.hpp b/sdk/storage/azure-storage-common/sample/samples_common.hpp similarity index 100% rename from sdk/storage/sample/samples_common.hpp rename to sdk/storage/azure-storage-common/sample/samples_common.hpp diff --git a/sdk/storage/src/common/account_sas_builder.cpp b/sdk/storage/azure-storage-common/src/account_sas_builder.cpp similarity index 96% rename from sdk/storage/src/common/account_sas_builder.cpp rename to sdk/storage/azure-storage-common/src/account_sas_builder.cpp index 7e41f3f5f..44e293287 100644 --- a/sdk/storage/src/common/account_sas_builder.cpp +++ b/sdk/storage/azure-storage-common/src/account_sas_builder.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/account_sas_builder.hpp" -#include "common/crypt.hpp" -#include "common/storage_uri_builder.hpp" +#include "azure/storage/common/account_sas_builder.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/src/common/crypt.cpp b/sdk/storage/azure-storage-common/src/crypt.cpp similarity index 99% rename from sdk/storage/src/common/crypt.cpp rename to sdk/storage/azure-storage-common/src/crypt.cpp index f122596c9..871d5c7a9 100644 --- a/sdk/storage/src/common/crypt.cpp +++ b/sdk/storage/azure-storage-common/src/crypt.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/crypt.hpp" +#include "azure/storage/common/crypt.hpp" #ifdef _WIN32 #include @@ -17,7 +17,7 @@ #include -#include "common/storage_common.hpp" +#include "azure/storage/common/storage_common.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/src/common/file_io.cpp b/sdk/storage/azure-storage-common/src/file_io.cpp similarity index 98% rename from sdk/storage/src/common/file_io.cpp rename to sdk/storage/azure-storage-common/src/file_io.cpp index 3d58f4130..7b1608abd 100644 --- a/sdk/storage/src/common/file_io.cpp +++ b/sdk/storage/azure-storage-common/src/file_io.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/file_io.hpp" +#include "azure/storage/common/file_io.hpp" #ifndef _WIN32 #include diff --git a/sdk/storage/src/common/reliable_stream.cpp b/sdk/storage/azure-storage-common/src/reliable_stream.cpp similarity index 96% rename from sdk/storage/src/common/reliable_stream.cpp rename to sdk/storage/azure-storage-common/src/reliable_stream.cpp index 1f30c892a..d33ebc9bb 100644 --- a/sdk/storage/src/common/reliable_stream.cpp +++ b/sdk/storage/azure-storage-common/src/reliable_stream.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/reliable_stream.hpp" +#include "azure/storage/common/reliable_stream.hpp" #include "azure/core/http/http.hpp" using Azure::Core::Context; diff --git a/sdk/storage/src/common/shared_key_policy.cpp b/sdk/storage/azure-storage-common/src/shared_key_policy.cpp similarity index 94% rename from sdk/storage/src/common/shared_key_policy.cpp rename to sdk/storage/azure-storage-common/src/shared_key_policy.cpp index 096b6357e..feb1afe1a 100644 --- a/sdk/storage/src/common/shared_key_policy.cpp +++ b/sdk/storage/azure-storage-common/src/shared_key_policy.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/shared_key_policy.hpp" +#include "azure/storage/common/shared_key_policy.hpp" -#include "common/crypt.hpp" -#include "common/storage_uri_builder.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/src/common/storage_common.cpp b/sdk/storage/azure-storage-common/src/storage_common.cpp similarity index 86% rename from sdk/storage/src/common/storage_common.cpp rename to sdk/storage/azure-storage-common/src/storage_common.cpp index a86111a42..ffaa0cca4 100644 --- a/sdk/storage/src/common/storage_common.cpp +++ b/sdk/storage/azure-storage-common/src/storage_common.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/storage_common.hpp" +#include "azure/storage/common/storage_common.hpp" #include "azure/core/uuid.hpp" diff --git a/sdk/storage/src/common/storage_credential.cpp b/sdk/storage/azure-storage-common/src/storage_credential.cpp similarity index 98% rename from sdk/storage/src/common/storage_credential.cpp rename to sdk/storage/azure-storage-common/src/storage_credential.cpp index 2043d3ba2..0357918e2 100644 --- a/sdk/storage/src/common/storage_credential.cpp +++ b/sdk/storage/azure-storage-common/src/storage_credential.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/storage_credential.hpp" +#include "azure/storage/common/storage_credential.hpp" #include diff --git a/sdk/storage/src/common/storage_error.cpp b/sdk/storage/azure-storage-common/src/storage_error.cpp similarity index 94% rename from sdk/storage/src/common/storage_error.cpp rename to sdk/storage/azure-storage-common/src/storage_error.cpp index ff38359f1..f66cd6d06 100644 --- a/sdk/storage/src/common/storage_error.cpp +++ b/sdk/storage/azure-storage-common/src/storage_error.cpp @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/storage_error.hpp" +#include "azure/storage/common/storage_error.hpp" -#include "common/constants.hpp" -#include "common/storage_common.hpp" -#include "common/xml_wrapper.hpp" #include "azure/core/http/policy.hpp" -#include "json.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/json.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/xml_wrapper.hpp" #include diff --git a/sdk/storage/src/common/storage_per_retry_policy.cpp b/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp similarity index 96% rename from sdk/storage/src/common/storage_per_retry_policy.cpp rename to sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp index 9254e6acf..1fc2ec722 100644 --- a/sdk/storage/src/common/storage_per_retry_policy.cpp +++ b/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" #include diff --git a/sdk/storage/src/common/storage_uri_builder.cpp b/sdk/storage/azure-storage-common/src/storage_uri_builder.cpp similarity index 99% rename from sdk/storage/src/common/storage_uri_builder.cpp rename to sdk/storage/azure-storage-common/src/storage_uri_builder.cpp index e781bb5f4..a1b8ce1a7 100644 --- a/sdk/storage/src/common/storage_uri_builder.cpp +++ b/sdk/storage/azure-storage-common/src/storage_uri_builder.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/storage_uri_builder.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" #include #include diff --git a/sdk/storage/azure-storage-common/src/storage_version.cpp b/sdk/storage/azure-storage-common/src/storage_version.cpp new file mode 100644 index 000000000..061de3750 --- /dev/null +++ b/sdk/storage/azure-storage-common/src/storage_version.cpp @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT + +namespace Azure { namespace Storage { + + const char* CommonComponentVersion = AZURE_STORAGE_COMMON_PACKAGE_VERSION; + const char* BlobServiceVersion = AZURE_STORAGE_BLOBS_PACKAGE_VERSION; + const char* DataLakeServiceVersion = AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION; + const char* FileServiceVersion = AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION; + +}} // namespace Azure::Storage diff --git a/sdk/storage/src/common/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp similarity index 98% rename from sdk/storage/src/common/xml_wrapper.cpp rename to sdk/storage/azure-storage-common/src/xml_wrapper.cpp index 52693f05d..d1b37289f 100644 --- a/sdk/storage/src/common/xml_wrapper.cpp +++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/xml_wrapper.hpp" +#include "azure/storage/common/xml_wrapper.hpp" #include "libxml/xmlreader.h" #include "libxml/xmlwriter.h" diff --git a/sdk/storage/test/common/bearer_token_test.cpp b/sdk/storage/azure-storage-common/test/bearer_token_test.cpp similarity index 96% rename from sdk/storage/test/common/bearer_token_test.cpp rename to sdk/storage/azure-storage-common/test/bearer_token_test.cpp index 927f4445f..2b1826d3a 100644 --- a/sdk/storage/test/common/bearer_token_test.cpp +++ b/sdk/storage/azure-storage-common/test/bearer_token_test.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "blobs/blob.hpp" #include "azure/core/credentials/credentials.hpp" +#include "azure/storage/blobs/blob.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/common/crypt_functions_test.cpp b/sdk/storage/azure-storage-common/test/crypt_functions_test.cpp similarity index 98% rename from sdk/storage/test/common/crypt_functions_test.cpp rename to sdk/storage/azure-storage-common/test/crypt_functions_test.cpp index 5137b114b..aefb019ca 100644 --- a/sdk/storage/test/common/crypt_functions_test.cpp +++ b/sdk/storage/azure-storage-common/test/crypt_functions_test.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "common/crypt.hpp" +#include "azure/storage/common/crypt.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/test_base.cpp b/sdk/storage/azure-storage-common/test/test_base.cpp similarity index 100% rename from sdk/storage/test/test_base.cpp rename to sdk/storage/azure-storage-common/test/test_base.cpp diff --git a/sdk/storage/test/test_base.hpp b/sdk/storage/azure-storage-common/test/test_base.hpp similarity index 97% rename from sdk/storage/test/test_base.hpp rename to sdk/storage/azure-storage-common/test/test_base.hpp index 961af7ee6..4e1d92bfb 100644 --- a/sdk/storage/test/test_base.hpp +++ b/sdk/storage/azure-storage-common/test/test_base.hpp @@ -4,10 +4,9 @@ #pragma once #include "azure/core/http/body_stream.hpp" +#include "azure/storage/common/constants.hpp" -#include "common/constants.hpp" - -#include "gtest/gtest.h" +#include #include #include diff --git a/sdk/storage/azure-storage-common/version.txt b/sdk/storage/azure-storage-common/version.txt new file mode 100644 index 000000000..ebb5fbf54 --- /dev/null +++ b/sdk/storage/azure-storage-common/version.txt @@ -0,0 +1 @@ +1.0.0-beta.1 \ No newline at end of file diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md new file mode 100644 index 000000000..94a47f6b3 --- /dev/null +++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md @@ -0,0 +1,33 @@ +# Release History + +## 1.0.0-preview.1 (Unreleased) + +* Added support for DataLake features: + - ServiceClient::ListFileSystems + - ServiceClient::GetUserDelegationKey + - FileSystemClient::Create + - FileSystemClient::Delete + - FileSystemClient::SetMetadata + - FileSystemClient::GetProperties + - FileSystemClient::ListPaths + - PathClient::Create + - PathClient::Delete + - PathClient::SetAccessControl + - PathClient::SetHttpHeaders + - PathClient::GetProperties + - PathClient::GetAccessControls + - PathClient::SetMetadata + - FileClient::AppendData + - FileClient::FlushData + - FileClient::Create + - FileClient::Rename + - FileClient::Delete + - FileClient::Read + - FileClient::UploadFromBuffer + - FileClient::UploadFromFile + - FileClient::DownloadToBuffer + - FileClient::DownloadToFile + - DirectoryClient::GetFileClient + - DirectoryClient::Create + - DirectoryClient::Rename + - DirectoryClient::Delete diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt new file mode 100644 index 000000000..bad6533bf --- /dev/null +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -0,0 +1,63 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT + +cmake_minimum_required (VERSION 3.15) + +set (AZURE_STORAGE_DATALAKE_HEADER + inc/azure/storage/files/datalake/datalake.hpp + inc/azure/storage/files/datalake/datalake_directory_client.hpp + inc/azure/storage/files/datalake/datalake_file_client.hpp + inc/azure/storage/files/datalake/datalake_file_system_client.hpp + inc/azure/storage/files/datalake/datalake_options.hpp + inc/azure/storage/files/datalake/datalake_path_client.hpp + inc/azure/storage/files/datalake/datalake_responses.hpp + inc/azure/storage/files/datalake/datalake_service_client.hpp + inc/azure/storage/files/datalake/datalake_utilities.hpp + inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp +) + +set (AZURE_STORAGE_DATALAKE_SOURCE + src/datalake_directory_client.cpp + src/datalake_file_client.cpp + src/datalake_file_system_client.cpp + src/datalake_path_client.cpp + src/datalake_responses.cpp + src/datalake_service_client.cpp + src/datalake_utilities.cpp +) + +add_library(azure-storage-files-datalake ${AZURE_STORAGE_DATALAKE_HEADER} ${AZURE_STORAGE_DATALAKE_SOURCE}) +target_include_directories(azure-storage-files-datalake PUBLIC inc) +target_link_libraries(azure-storage-files-datalake azure-storage-blobs) +file(READ version.txt AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION) +target_compile_definitions(azure-storage-common PUBLIC AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION="${AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION}") +message("Azure Storage Files DataLake Package Version ${AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION}") +add_library(azure::storage::files::datalake ALIAS azure-storage-files-datalake) + + +target_sources( + azure-storage-test + PRIVATE + test/datalake_directory_client_test.cpp + test/datalake_directory_client_test.hpp + test/datalake_file_client_test.cpp + test/datalake_file_client_test.hpp + test/datalake_file_system_client_test.cpp + test/datalake_file_system_client_test.hpp + test/datalake_path_client_test.cpp + test/datalake_path_client_test.hpp + test/datalake_service_client_test.cpp + test/datalake_service_client_test.hpp +) + +target_link_libraries(azure-storage-test PUBLIC azure::storage::files::datalake) + + +target_sources( + azure-storage-sample + PRIVATE + sample/datalake_getting_started.cpp +) +target_link_libraries(azure-storage-sample PUBLIC azure::storage::files::datalake) + +generate_documentation(azure-storage-files-datalake ${AZURE_STORAGE_FILES_DATALAKE_PACKAGE_VERSION}) diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp new file mode 100644 index 000000000..ab22dce52 --- /dev/null +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT + +#pragma once + +#include "azure/storage/files/datalake/datalake_directory_client.hpp" +#include "azure/storage/files/datalake/datalake_file_client.hpp" +#include "azure/storage/files/datalake/datalake_file_system_client.hpp" +#include "azure/storage/files/datalake/datalake_path_client.hpp" +#include "azure/storage/files/datalake/datalake_service_client.hpp" diff --git a/sdk/storage/inc/datalake/datalake_directory_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp similarity index 94% rename from sdk/storage/inc/datalake/datalake_directory_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp index e860dcae4..6fe3369fa 100644 --- a/sdk/storage/inc/datalake/datalake_directory_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp @@ -3,15 +3,15 @@ #pragma once -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "datalake/datalake_path_client.hpp" -#include "datalake_options.hpp" -#include "datalake_responses.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/datalake_rest_client.hpp" #include "azure/core/response.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_path_client.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_file_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp similarity index 96% rename from sdk/storage/inc/datalake/datalake_file_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp index e45099e90..28e4806c5 100644 --- a/sdk/storage/inc/datalake/datalake_file_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp @@ -3,16 +3,16 @@ #pragma once -#include "blobs/block_blob_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "datalake/datalake_path_client.hpp" -#include "datalake_options.hpp" -#include "datalake_responses.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/datalake_rest_client.hpp" #include "azure/core/response.hpp" +#include "azure/storage/blobs/block_blob_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_path_client.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_file_system_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp similarity index 94% rename from sdk/storage/inc/datalake/datalake_file_system_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp index 742528657..e86f7b445 100644 --- a/sdk/storage/inc/datalake/datalake_file_system_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp @@ -3,16 +3,16 @@ #pragma once -#include "blobs/blob_container_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "datalake/datalake_service_client.hpp" -#include "datalake_options.hpp" -#include "datalake_responses.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/datalake_rest_client.hpp" #include "azure/core/response.hpp" +#include "azure/storage/blobs/blob_container_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/datalake_service_client.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp similarity index 99% rename from sdk/storage/inc/datalake/datalake_options.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp index b7275c0aa..cda3dc856 100644 --- a/sdk/storage/inc/datalake/datalake_options.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp @@ -3,10 +3,10 @@ #pragma once -#include "blobs/blob_options.hpp" -#include "common/access_conditions.hpp" #include "azure/core/nullable.hpp" -#include "protocol/datalake_rest_client.hpp" +#include "azure/storage/blobs/blob_options.hpp" +#include "azure/storage/common/access_conditions.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_path_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp similarity index 96% rename from sdk/storage/inc/datalake/datalake_path_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp index 072f9a8f6..ae0356b7e 100644 --- a/sdk/storage/inc/datalake/datalake_path_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp @@ -3,16 +3,16 @@ #pragma once -#include "blobs/blob_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "datalake/datalake_file_system_client.hpp" -#include "datalake_options.hpp" -#include "datalake_responses.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/datalake_rest_client.hpp" #include "azure/core/response.hpp" +#include "azure/storage/blobs/blob_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/datalake/datalake_file_system_client.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp similarity index 97% rename from sdk/storage/inc/datalake/datalake_responses.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index 8c88fd840..58b407ab5 100644 --- a/sdk/storage/inc/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -3,8 +3,8 @@ #pragma once -#include "blobs/protocol/blob_rest_client.hpp" -#include "protocol/datalake_rest_client.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { diff --git a/sdk/storage/inc/datalake/datalake_service_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp similarity index 92% rename from sdk/storage/inc/datalake/datalake_service_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp index 4405accf9..3f815307b 100644 --- a/sdk/storage/inc/datalake/datalake_service_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp @@ -3,15 +3,15 @@ #pragma once -#include "blobs/blob_service_client.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" -#include "datalake_options.hpp" -#include "datalake_responses.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/datalake_rest_client.hpp" #include "azure/core/response.hpp" +#include "azure/storage/blobs/blob_service_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_utilities.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_utilities.hpp similarity index 100% rename from sdk/storage/inc/datalake/datalake_utilities.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_utilities.hpp diff --git a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp similarity index 99% rename from sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp index 8292b1a3e..5d7e3417f 100644 --- a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp @@ -4,13 +4,13 @@ #pragma once -#include "common/storage_common.hpp" -#include "common/storage_error.hpp" #include "azure/core/http/http.hpp" #include "azure/core/http/pipeline.hpp" -#include "json.hpp" #include "azure/core/nullable.hpp" #include "azure/core/response.hpp" +#include "azure/storage/common/json.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_error.hpp" #include #include diff --git a/sdk/storage/sample/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp similarity index 98% rename from sdk/storage/sample/datalake_getting_started.cpp rename to sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp index 5afc71c89..cb3fc7ff4 100644 --- a/sdk/storage/sample/datalake_getting_started.cpp +++ b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" -#include "samples_common.hpp" #include +#include "azure/storage/files/datalake/datalake.hpp" +#include "samples_common.hpp" + SAMPLE(DataLakeGettingStarted, DataLakeGettingStarted) void DataLakeGettingStarted() { diff --git a/sdk/storage/src/datalake/datalake_directory_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp similarity index 94% rename from sdk/storage/src/datalake/datalake_directory_client.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp index e4e10c019..0f5cd9df4 100644 --- a/sdk/storage/src/datalake/datalake_directory_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_directory_client.hpp" +#include "azure/storage/files/datalake/datalake_directory_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" -#include "datalake/datalake_file_client.hpp" -#include "datalake/datalake_utilities.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/datalake/datalake_file_client.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp similarity index 97% rename from sdk/storage/src/datalake/datalake_file_client.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp index 511cbbdfe..8e3c0886d 100644 --- a/sdk/storage/src/datalake/datalake_file_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_file_client.hpp" +#include "azure/storage/files/datalake/datalake_file_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" -#include "datalake/datalake_utilities.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_file_system_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp similarity index 93% rename from sdk/storage/src/datalake/datalake_file_system_client.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp index 08c69cdd6..33a192a50 100644 --- a/sdk/storage/src/datalake/datalake_file_system_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_file_system_client.hpp" +#include "azure/storage/files/datalake/datalake_file_system_client.hpp" -#include "blobs/protocol/blob_rest_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" -#include "datalake/datalake_directory_client.hpp" -#include "datalake/datalake_file_client.hpp" -#include "datalake/datalake_path_client.hpp" -#include "datalake/datalake_utilities.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/datalake/datalake_directory_client.hpp" +#include "azure/storage/files/datalake/datalake_file_client.hpp" +#include "azure/storage/files/datalake/datalake_path_client.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace { diff --git a/sdk/storage/src/datalake/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp similarity index 97% rename from sdk/storage/src/datalake/datalake_path_client.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp index 10529cf60..ba2d613a9 100644 --- a/sdk/storage/src/datalake/datalake_path_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_path_client.hpp" +#include "azure/storage/files/datalake/datalake_path_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" -#include "datalake/datalake_utilities.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_responses.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp similarity index 94% rename from sdk/storage/src/datalake/datalake_responses.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp index 3c1e9abbb..3909b21fa 100644 --- a/sdk/storage/src/datalake/datalake_responses.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_responses.hpp" +#include "azure/storage/files/datalake/datalake_responses.hpp" -#include "datalake/datalake_utilities.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { diff --git a/sdk/storage/src/datalake/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp similarity index 92% rename from sdk/storage/src/datalake/datalake_service_client.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp index 01e39af93..f881c55ec 100644 --- a/sdk/storage/src/datalake/datalake_service_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_service_client.hpp" +#include "azure/storage/files/datalake/datalake_service_client.hpp" -#include "blobs/protocol/blob_rest_client.hpp" -#include "common/constants.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" -#include "datalake/datalake_file_system_client.hpp" -#include "datalake/datalake_utilities.hpp" #include "azure/core/http/curl/curl.hpp" +#include "azure/storage/blobs/protocol/blob_rest_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/datalake/datalake_file_system_client.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace { diff --git a/sdk/storage/src/datalake/datalake_utilities.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp similarity index 94% rename from sdk/storage/src/datalake/datalake_utilities.cpp rename to sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp index 773f92988..0a3fd3507 100644 --- a/sdk/storage/src/datalake/datalake_utilities.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake_utilities.hpp" +#include "azure/storage/files/datalake/datalake_utilities.hpp" -#include "common/crypt.hpp" -#include "datalake/protocol/datalake_rest_client.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace Details { diff --git a/sdk/storage/test/datalake/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp similarity index 100% rename from sdk/storage/test/datalake/datalake_directory_client_test.cpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp diff --git a/sdk/storage/test/datalake/datalake_directory_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp similarity index 91% rename from sdk/storage/test/datalake/datalake_directory_client_test.hpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp index babda43df..191a52e59 100644 --- a/sdk/storage/test/datalake/datalake_directory_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" +#include "azure/storage/files/datalake/datalake.hpp" #include "datalake_path_client_test.hpp" #include "test_base.hpp" diff --git a/sdk/storage/test/datalake/datalake_file_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp similarity index 100% rename from sdk/storage/test/datalake/datalake_file_client_test.cpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp diff --git a/sdk/storage/test/datalake/datalake_file_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp similarity index 90% rename from sdk/storage/test/datalake/datalake_file_client_test.hpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp index c146a65c1..957278bc4 100644 --- a/sdk/storage/test/datalake/datalake_file_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" +#include "azure/storage/files/datalake/datalake.hpp" #include "datalake_file_system_client_test.hpp" #include "test_base.hpp" diff --git a/sdk/storage/test/datalake/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp similarity index 99% rename from sdk/storage/test/datalake/datalake_file_system_client_test.cpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp index 2ca8c9e13..913130e8e 100644 --- a/sdk/storage/test/datalake/datalake_file_system_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "datalake_file_system_client_test.hpp" -#include "datalake/datalake_options.hpp" +#include "azure/storage/files/datalake/datalake_options.hpp" #include diff --git a/sdk/storage/test/datalake/datalake_file_system_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp similarity index 94% rename from sdk/storage/test/datalake/datalake_file_system_client_test.hpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp index 42f1aa989..3a3ed3c91 100644 --- a/sdk/storage/test/datalake/datalake_file_system_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" +#include "azure/storage/files/datalake/datalake.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/datalake/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp similarity index 100% rename from sdk/storage/test/datalake/datalake_path_client_test.cpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp diff --git a/sdk/storage/test/datalake/datalake_path_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp similarity index 91% rename from sdk/storage/test/datalake/datalake_path_client_test.hpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp index 17c3922e9..efe148996 100644 --- a/sdk/storage/test/datalake/datalake_path_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" +#include "azure/storage/files/datalake/datalake.hpp" #include "datalake_file_system_client_test.hpp" #include "test_base.hpp" diff --git a/sdk/storage/test/datalake/datalake_service_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp similarity index 100% rename from sdk/storage/test/datalake/datalake_service_client_test.cpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp diff --git a/sdk/storage/test/datalake/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp similarity index 93% rename from sdk/storage/test/datalake/datalake_service_client_test.hpp rename to sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp index 429aaa269..603466e8e 100644 --- a/sdk/storage/test/datalake/datalake_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "datalake/datalake.hpp" +#include "azure/storage/files/datalake/datalake.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/azure-storage-files-datalake/version.txt b/sdk/storage/azure-storage-files-datalake/version.txt new file mode 100644 index 000000000..ebb5fbf54 --- /dev/null +++ b/sdk/storage/azure-storage-files-datalake/version.txt @@ -0,0 +1 @@ +1.0.0-beta.1 \ No newline at end of file diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt new file mode 100644 index 000000000..259ce0ce2 --- /dev/null +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -0,0 +1,57 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT + +cmake_minimum_required (VERSION 3.15) + +set (AZURE_STORAGE_SHARES_HEADER + inc/azure/storage/files/shares/protocol/share_rest_client.hpp + inc/azure/storage/files/shares/share_client.hpp + inc/azure/storage/files/shares/share_constants.hpp + inc/azure/storage/files/shares/share_directory_client.hpp + inc/azure/storage/files/shares/share_file_attribute.hpp + inc/azure/storage/files/shares/share_file_client.hpp + inc/azure/storage/files/shares/share_options.hpp + inc/azure/storage/files/shares/share_responses.hpp + inc/azure/storage/files/shares/share_service_client.hpp + inc/azure/storage/files/shares/shares.hpp +) + +set (AZURE_STORAGE_SHARES_SOURCE + src/share_client.cpp + src/share_directory_client.cpp + src/share_file_client.cpp + src/share_service_client.cpp +) + +add_library(azure-storage-files-shares ${AZURE_STORAGE_SHARES_HEADER} ${AZURE_STORAGE_SHARES_SOURCE}) +target_include_directories(azure-storage-files-shares PUBLIC inc) +target_link_libraries(azure-storage-files-shares azure-storage-common) +file(READ version.txt AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION) +target_compile_definitions(azure-storage-common PUBLIC AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION="${AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION}") +message("Azure Storage Files Shares Package Version ${AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION}") +add_library(azure::storage::files::shares ALIAS azure-storage-files-shares) + + +target_sources( + azure-storage-test + PRIVATE + test/share_client_test.cpp + test/share_client_test.hpp + test/share_directory_client_test.cpp + test/share_directory_client_test.hpp + test/share_file_client_test.cpp + test/share_file_client_test.hpp + test/share_service_client_test.cpp + test/share_service_client_test.hpp +) +target_link_libraries(azure-storage-test PUBLIC azure::storage::files::shares) + + +target_sources( + azure-storage-sample + PRIVATE + sample/file_share_getting_started.cpp +) +target_link_libraries(azure-storage-sample PUBLIC azure::storage::files::shares) + +generate_documentation(azure-storage-files-shares ${AZURE_STORAGE_FILES_SHARES_PACKAGE_VERSION}) diff --git a/sdk/storage/inc/shares/protocol/share_rest_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp similarity index 99% rename from sdk/storage/inc/shares/protocol/share_rest_client.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp index e817d00f2..5ea29d163 100644 --- a/sdk/storage/inc/shares/protocol/share_rest_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp @@ -8,10 +8,10 @@ #include "azure/core/http/pipeline.hpp" #include "azure/core/nullable.hpp" #include "azure/core/response.hpp" -#include "common/storage_common.hpp" -#include "common/storage_error.hpp" -#include "common/xml_wrapper.hpp" -#include "json.hpp" +#include "azure/storage/common/json.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/xml_wrapper.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp similarity index 96% rename from sdk/storage/inc/shares/share_client.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp index 30e3f62d9..b94526a08 100644 --- a/sdk/storage/inc/shares/share_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp @@ -3,15 +3,15 @@ #pragma once -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/share_rest_client.hpp" #include "azure/core/response.hpp" -#include "share_options.hpp" -#include "share_responses.hpp" -#include "shares/share_service_client.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_options.hpp" +#include "azure/storage/files/shares/share_responses.hpp" +#include "azure/storage/files/shares/share_service_client.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_constants.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_constants.hpp similarity index 100% rename from sdk/storage/inc/shares/share_constants.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_constants.hpp diff --git a/sdk/storage/inc/shares/share_directory_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp similarity index 96% rename from sdk/storage/inc/shares/share_directory_client.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp index 6525f7a72..d55778639 100644 --- a/sdk/storage/inc/shares/share_directory_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp @@ -3,15 +3,15 @@ #pragma once -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/share_rest_client.hpp" #include "azure/core/response.hpp" -#include "share_client.hpp" -#include "share_options.hpp" -#include "share_responses.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_client.hpp" +#include "azure/storage/files/shares/share_options.hpp" +#include "azure/storage/files/shares/share_responses.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_file_attribute.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp similarity index 100% rename from sdk/storage/inc/shares/share_file_attribute.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp diff --git a/sdk/storage/inc/shares/share_file_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp similarity index 97% rename from sdk/storage/inc/shares/share_file_client.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp index e39d53fe6..69c460b90 100644 --- a/sdk/storage/inc/shares/share_file_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp @@ -6,13 +6,13 @@ #include "azure/core/credentials/credentials.hpp" #include "azure/core/http/pipeline.hpp" #include "azure/core/response.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" -#include "protocol/share_rest_client.hpp" -#include "share_client.hpp" -#include "share_directory_client.hpp" -#include "share_options.hpp" -#include "share_responses.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_client.hpp" +#include "azure/storage/files/shares/share_directory_client.hpp" +#include "azure/storage/files/shares/share_options.hpp" +#include "azure/storage/files/shares/share_responses.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_options.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp similarity index 99% rename from sdk/storage/inc/shares/share_options.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp index 0719bd34f..8f455229d 100644 --- a/sdk/storage/inc/shares/share_options.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp @@ -4,9 +4,9 @@ #pragma once #include "azure/core/nullable.hpp" -#include "common/access_conditions.hpp" -#include "protocol/share_rest_client.hpp" -#include "share_responses.hpp" +#include "azure/storage/common/access_conditions.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_responses.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp similarity index 95% rename from sdk/storage/inc/shares/share_responses.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp index a15e5f02e..8dd2082d6 100644 --- a/sdk/storage/inc/shares/share_responses.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp @@ -3,9 +3,9 @@ #pragma once -#include "protocol/share_rest_client.hpp" -#include "share_constants.hpp" -#include "share_file_attribute.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_constants.hpp" +#include "azure/storage/files/shares/share_file_attribute.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/inc/shares/share_service_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp similarity index 93% rename from sdk/storage/inc/shares/share_service_client.hpp rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp index 5c7c811fa..6e63e66fb 100644 --- a/sdk/storage/inc/shares/share_service_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp @@ -3,14 +3,14 @@ #pragma once -#include "common/storage_credential.hpp" -#include "common/storage_uri_builder.hpp" #include "azure/core/credentials/credentials.hpp" #include "azure/core/http/pipeline.hpp" -#include "protocol/share_rest_client.hpp" #include "azure/core/response.hpp" -#include "share_options.hpp" -#include "share_responses.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_uri_builder.hpp" +#include "azure/storage/files/shares/protocol/share_rest_client.hpp" +#include "azure/storage/files/shares/share_options.hpp" +#include "azure/storage/files/shares/share_responses.hpp" #include #include diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp new file mode 100644 index 000000000..9d433109a --- /dev/null +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp @@ -0,0 +1,9 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT + +#pragma once + +#include "azure/storage/files/shares/share_client.hpp" +#include "azure/storage/files/shares/share_directory_client.hpp" +#include "azure/storage/files/shares/share_file_client.hpp" +#include "azure/storage/files/shares/share_service_client.hpp" diff --git a/sdk/storage/sample/file_share_getting_started.cpp b/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp similarity index 96% rename from sdk/storage/sample/file_share_getting_started.cpp rename to sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp index 8e97eb555..3bf522b25 100644 --- a/sdk/storage/sample/file_share_getting_started.cpp +++ b/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "samples_common.hpp" -#include "shares/shares.hpp" #include +#include "azure/storage/files/shares/shares.hpp" +#include "samples_common.hpp" + SAMPLE(FileShareGettingStarted, FileShareGettingStarted) void FileShareGettingStarted() { diff --git a/sdk/storage/src/shares/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp similarity index 95% rename from sdk/storage/src/shares/share_client.cpp rename to sdk/storage/azure-storage-files-shares/src/share_client.cpp index 038b2541c..730497ef0 100644 --- a/sdk/storage/src/shares/share_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/share_client.hpp" +#include "azure/storage/files/shares/share_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" -#include "shares/share_directory_client.hpp" -#include "shares/share_file_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/shares/share_directory_client.hpp" +#include "azure/storage/files/shares/share_file_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/src/shares/share_directory_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp similarity index 96% rename from sdk/storage/src/shares/share_directory_client.cpp rename to sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp index 7e581e73e..ec3301cae 100644 --- a/sdk/storage/src/shares/share_directory_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/share_directory_client.hpp" +#include "azure/storage/files/shares/share_directory_client.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" -#include "shares/share_file_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/shares/share_file_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/src/shares/share_file_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp similarity index 98% rename from sdk/storage/src/shares/share_file_client.cpp rename to sdk/storage/azure-storage-files-shares/src/share_file_client.cpp index b2996ae24..8409625c4 100644 --- a/sdk/storage/src/shares/share_file_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/share_file_client.hpp" +#include "azure/storage/files/shares/share_file_client.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" -#include "common/concurrent_transfer.hpp" -#include "common/constants.hpp" -#include "common/crypt.hpp" -#include "common/file_io.hpp" -#include "common/reliable_stream.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" -#include "shares/share_constants.hpp" +#include "azure/storage/common/concurrent_transfer.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/file_io.hpp" +#include "azure/storage/common/reliable_stream.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/shares/share_constants.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/src/shares/share_service_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp similarity index 93% rename from sdk/storage/src/shares/share_service_client.cpp rename to sdk/storage/azure-storage-files-shares/src/share_service_client.cpp index 2afbf3367..e7f357a41 100644 --- a/sdk/storage/src/shares/share_service_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/share_service_client.hpp" +#include "azure/storage/files/shares/share_service_client.hpp" -#include "common/constants.hpp" -#include "common/shared_key_policy.hpp" -#include "common/storage_common.hpp" -#include "common/storage_credential.hpp" -#include "common/storage_per_retry_policy.hpp" -#include "common/storage_version.hpp" #include "azure/core/credentials/policy/policies.hpp" #include "azure/core/http/curl/curl.hpp" -#include "shares/share_client.hpp" +#include "azure/storage/common/constants.hpp" +#include "azure/storage/common/shared_key_policy.hpp" +#include "azure/storage/common/storage_common.hpp" +#include "azure/storage/common/storage_credential.hpp" +#include "azure/storage/common/storage_per_retry_policy.hpp" +#include "azure/storage/common/storage_version.hpp" +#include "azure/storage/files/shares/share_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { ServiceClient ServiceClient::CreateFromConnectionString( diff --git a/sdk/storage/test/shares/share_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_client_test.cpp similarity index 100% rename from sdk/storage/test/shares/share_client_test.cpp rename to sdk/storage/azure-storage-files-shares/test/share_client_test.cpp diff --git a/sdk/storage/test/shares/share_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp similarity index 91% rename from sdk/storage/test/shares/share_client_test.hpp rename to sdk/storage/azure-storage-files-shares/test/share_client_test.hpp index 8fca8bc2a..f6531e942 100644 --- a/sdk/storage/test/shares/share_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/shares.hpp" +#include "azure/storage/files/shares/shares.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/shares/share_directory_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp similarity index 100% rename from sdk/storage/test/shares/share_directory_client_test.cpp rename to sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp diff --git a/sdk/storage/test/shares/share_directory_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp similarity index 94% rename from sdk/storage/test/shares/share_directory_client_test.hpp rename to sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp index adde45308..e2e2e37e9 100644 --- a/sdk/storage/test/shares/share_directory_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/files/shares/shares.hpp" #include "share_client_test.hpp" -#include "shares/shares.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/shares/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp similarity index 99% rename from sdk/storage/test/shares/share_file_client_test.cpp rename to sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp index 756f56022..3f19ff4cd 100644 --- a/sdk/storage/test/shares/share_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp @@ -3,9 +3,9 @@ #include "share_file_client_test.hpp" -#include "common/crypt.hpp" -#include "common/file_io.hpp" -#include "common/storage_common.hpp" +#include "azure/storage/common/crypt.hpp" +#include "azure/storage/common/file_io.hpp" +#include "azure/storage/common/storage_common.hpp" #include #include diff --git a/sdk/storage/test/shares/share_file_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp similarity index 92% rename from sdk/storage/test/shares/share_file_client_test.hpp rename to sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp index ede5b9c22..6aeb2daaf 100644 --- a/sdk/storage/test/shares/share_file_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT +#include "azure/storage/files/shares/shares.hpp" #include "share_directory_client_test.hpp" -#include "shares/shares.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/shares/share_service_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp similarity index 100% rename from sdk/storage/test/shares/share_service_client_test.cpp rename to sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp diff --git a/sdk/storage/test/shares/share_service_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp similarity index 93% rename from sdk/storage/test/shares/share_service_client_test.hpp rename to sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp index 7db236321..a8298baf7 100644 --- a/sdk/storage/test/shares/share_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "shares/shares.hpp" +#include "azure/storage/files/shares/shares.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/azure-storage-files-shares/version.txt b/sdk/storage/azure-storage-files-shares/version.txt new file mode 100644 index 000000000..ebb5fbf54 --- /dev/null +++ b/sdk/storage/azure-storage-files-shares/version.txt @@ -0,0 +1 @@ +1.0.0-beta.1 \ No newline at end of file diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 0096f2639..78c1c6626 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -34,5 +34,11 @@ stages: # TODO: Change to azure-storage once we have an strategy to run livetests or use test recordings CtestRegex: azure-core Artifacts: - - Name: azure-storage - Path: . + - Name: azure-storage-common + Path: azure-storage-common + - Name: azure-storage-blobs + Path: azure-storage-blobs + - Name: azure-storage-files-datalake + Path: azure-storage-files-datalake + - Name: azure-storage-files-shares + Path: azure-storage-files-shares diff --git a/sdk/storage/inc/blobs/blob.hpp b/sdk/storage/inc/blobs/blob.hpp deleted file mode 100644 index 71bfcc703..000000000 --- a/sdk/storage/inc/blobs/blob.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// SPDX-License-Identifier: MIT - -#pragma once - -#include "blobs/append_blob_client.hpp" -#include "blobs/blob_client.hpp" -#include "blobs/blob_container_client.hpp" -#include "blobs/blob_service_client.hpp" -#include "blobs/block_blob_client.hpp" -#include "blobs/page_blob_client.hpp" diff --git a/sdk/storage/inc/common/storage_version.hpp b/sdk/storage/inc/common/storage_version.hpp deleted file mode 100644 index a0ee9a58b..000000000 --- a/sdk/storage/inc/common/storage_version.hpp +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// SPDX-License-Identifier: MIT - -#pragma once - -namespace Azure { namespace Storage { - - constexpr static const char* CommonComponentVersion = "1.0.0-private.beta.1"; - constexpr static const char* BlobServiceVersion = "1.0.0-private.beta.1"; - constexpr static const char* DataLakeServiceVersion = "1.0.0-private.beta.1"; - constexpr static const char* FileServiceVersion = "1.0.0-private.beta.1"; - -}} // namespace Azure::Storage diff --git a/sdk/storage/inc/datalake/datalake.hpp b/sdk/storage/inc/datalake/datalake.hpp deleted file mode 100644 index a446473f7..000000000 --- a/sdk/storage/inc/datalake/datalake.hpp +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// SPDX-License-Identifier: MIT - -#pragma once - -#include "datalake/datalake_directory_client.hpp" -#include "datalake/datalake_file_client.hpp" -#include "datalake/datalake_file_system_client.hpp" -#include "datalake/datalake_path_client.hpp" -#include "datalake/datalake_service_client.hpp" diff --git a/sdk/storage/inc/shares/shares.hpp b/sdk/storage/inc/shares/shares.hpp deleted file mode 100644 index af0008c90..000000000 --- a/sdk/storage/inc/shares/shares.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// SPDX-License-Identifier: MIT - -#pragma once - -#include "share_client.hpp" -#include "share_directory_client.hpp" -#include "share_file_client.hpp" -#include "share_service_client.hpp" diff --git a/sdk/storage/sample/CMakeLists.txt b/sdk/storage/sample/CMakeLists.txt deleted file mode 100644 index ded45325d..000000000 --- a/sdk/storage/sample/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT - -cmake_minimum_required (VERSION 3.15) - -add_executable ( - azure-storage-sample - main.cpp - samples_common.hpp - blob_getting_started.cpp - datalake_getting_started.cpp - file_share_getting_started.cpp) - -target_link_libraries(azure-storage-sample azure::storage::blob azure::storage::file::datalake azure::storage::file::share) diff --git a/sdk/storage/test/CMakeLists.txt b/sdk/storage/test/CMakeLists.txt deleted file mode 100644 index 251742ae4..000000000 --- a/sdk/storage/test/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT - -cmake_minimum_required (VERSION 3.15) - -add_executable ( - azure-storage-test - test_base.hpp - test_base.cpp - common/bearer_token_test.cpp - common/crypt_functions_test.cpp - blobs/blob_service_client_test.cpp - blobs/blob_container_client_test.hpp - blobs/blob_container_client_test.cpp - blobs/block_blob_client_test.hpp - blobs/block_blob_client_test.cpp - blobs/append_blob_client_test.hpp - blobs/append_blob_client_test.cpp - blobs/page_blob_client_test.hpp - blobs/page_blob_client_test.cpp - blobs/blob_sas_test.cpp - blobs/performance_benchmark.cpp - blobs/large_scale_test.cpp - datalake/datalake_service_client_test.hpp - datalake/datalake_service_client_test.cpp - datalake/datalake_file_system_client_test.hpp - datalake/datalake_file_system_client_test.cpp - datalake/datalake_path_client_test.hpp - datalake/datalake_path_client_test.cpp - datalake/datalake_file_client_test.hpp - datalake/datalake_file_client_test.cpp - datalake/datalake_directory_client_test.hpp - datalake/datalake_directory_client_test.cpp - shares/share_service_client_test.hpp - shares/share_service_client_test.cpp - shares/share_client_test.cpp - shares/share_client_test.hpp - shares/share_directory_client_test.hpp - shares/share_directory_client_test.cpp - shares/share_file_client_test.cpp - shares/share_file_client_test.hpp - ) - -target_include_directories(azure-storage-test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -target_link_libraries(azure-storage-test PUBLIC azure::storage::blob azure::storage::file::datalake azure::storage::file::share) - -if (MSVC) - target_compile_options(azure-storage-test PUBLIC /wd6326 /wd26495 /wd26812) -endif() - -add_gtest(azure-storage-test) diff --git a/sdk/storage/version.txt b/sdk/storage/version.txt deleted file mode 100644 index b812a2469..000000000 --- a/sdk/storage/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.0.0-preview.1 \ No newline at end of file