Restructure storage directory (#536)

* Restructure azure storage directory

* Add tests and sample

* reformat with clang-format

* Reorder files in CMake

* load versions from version.txt

* fix crash

* Update README.md

* Use relative links

* fix CI

* Fix CI

* Try to fix CI

* Move option to the top of the file

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:

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} $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/external> $<INSTALL_INTERFACE:include/azure_storage>)
-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)

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=<YOUR_VCPKG_INSTALL_DIR>/scripts/buildsystems/vcpkg.cmake -DBUILD_STORAGE_SAMPLES=ON
+cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE=<YOUR_VCPKG_INSTALL_DIR>/scripts/buildsystems/vcpkg.cmake
 cmake --build .
 ```
 
@@ -86,7 +86,7 @@ The libraries will be in `<ProjectRoot>\out\build\<Configuration>\sdk\<LibraryNa
 You can run the following command in a new folder created under the downloaded code's root folder to build the code.
 
 ```bash
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_STORAGE_SAMPLES=ON
+cmake .. -DCMAKE_BUILD_TYPE=Debug
 cmake --build .
 ```
 Then you can consume the built library with the header files.
@@ -110,5 +110,5 @@ TODO when ready.
 ## Code Samples
 
 To get started with the coding, please visit the following code samples:
-- [How to use Blob Storage from C++](https://github.com/Azure/azure-sdk-for-cpp/blob/master/sdk/storage/sample/blob_getting_started.cpp)
-- [How to use DataLake Gen 2 Storage from C++](https://github.com/Azure/azure-sdk-for-cpp/blob/master/sdk/storage/sample/datalake_getting_started.cpp)
+- [How to use Blob Storage from C++](azure-storage-blobs/sample/blob_getting_started.cpp)
+- [How to use DataLake Gen 2 Storage from C++](azure-storage-files-datalake/sample/datalake_getting_started.cpp)

sdk/storage/azure-storage-blobs/CHANGELOG.md

@@ -39,33 +39,3 @@
   - PageBlobClient::Resize
   - PageBlobClient::GetPageRanges
   - PageBlobClient::StartCopyIncremental
-
-* 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

sdk/storage/azure-storage-blobs/CMakeLists.txt

@@ -0,0 +1,66 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# SPDX-License-Identifier: MIT
+
+cmake_minimum_required (VERSION 3.15)
+
+set (AZURE_STORAGE_BLOB_HEADER
+    inc/azure/storage/blobs/append_blob_client.hpp
+    inc/azure/storage/blobs/blob.hpp
+    inc/azure/storage/blobs/blob_client.hpp
+    inc/azure/storage/blobs/blob_container_client.hpp
+    inc/azure/storage/blobs/blob_options.hpp
+    inc/azure/storage/blobs/blob_responses.hpp
+    inc/azure/storage/blobs/blob_sas_builder.hpp
+    inc/azure/storage/blobs/blob_service_client.hpp
+    inc/azure/storage/blobs/block_blob_client.hpp
+    inc/azure/storage/blobs/page_blob_client.hpp
+    inc/azure/storage/blobs/protocol/blob_rest_client.hpp
+)
+
+set (AZURE_STORAGE_BLOB_SOURCE
+    src/append_blob_client.cpp
+    src/blob_client.cpp
+    src/blob_container_client.cpp
+    src/blob_sas_builder.cpp
+    src/blob_service_client.cpp
+    src/block_blob_client.cpp
+    src/page_blob_client.cpp
+)
+
+add_library(azure-storage-blobs ${AZURE_STORAGE_BLOB_HEADER} ${AZURE_STORAGE_BLOB_SOURCE})
+target_include_directories(azure-storage-blobs PUBLIC inc)
+target_link_libraries(azure-storage-blobs azure::storage::common)
+file(READ version.txt AZURE_STORAGE_BLOBS_PACKAGE_VERSION)
+target_compile_definitions(azure-storage-common PUBLIC AZURE_STORAGE_BLOBS_PACKAGE_VERSION="${AZURE_STORAGE_BLOBS_PACKAGE_VERSION}")
+message("Azure Storage Blobs Package Version ${AZURE_STORAGE_BLOBS_PACKAGE_VERSION}")
+add_library(azure::storage::blobs ALIAS azure-storage-blobs)
+
+
+target_sources(
+    azure-storage-test
+    PRIVATE
+    test/append_blob_client_test.cpp
+    test/append_blob_client_test.hpp
+    test/blob_container_client_test.cpp
+    test/blob_container_client_test.hpp
+    test/blob_sas_test.cpp
+    test/blob_service_client_test.cpp
+    test/block_blob_client_test.cpp
+    test/block_blob_client_test.hpp
+    test/large_scale_test.cpp
+    test/page_blob_client_test.cpp
+    test/page_blob_client_test.hpp
+    test/performance_benchmark.cpp
+)
+
+target_link_libraries(azure-storage-test PUBLIC azure::storage::blobs)
+
+
+target_sources(
+    azure-storage-sample
+    PRIVATE
+    sample/blob_getting_started.cpp
+)
+target_link_libraries(azure-storage-sample PUBLIC azure::storage::blobs)
+
+generate_documentation(azure-storage-blobs ${AZURE_STORAGE_BLOBS_PACKAGE_VERSION})

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_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 <string>
 

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"

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 <map>
 #include <memory>

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 <map>
 #include <memory>

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 <limits>
 #include <string>

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 <map>
 #include <string>

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp

@@ -5,10 +5,10 @@
 
 #include <string>
 
-#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 {
 

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 <memory>
 #include <string>

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 <map>
 #include <string>

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 <string>
 

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 <cstring>
 #include <limits>

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 <iostream>
 
+#include "azure/storage/blobs/blob.hpp"
+#include "samples_common.hpp"
+
 SAMPLE(BlobsGettingStarted, BlobsGettingStarted)
 void BlobsGettingStarted()
 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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 <chrono>
 #include <thread>

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 {

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 {
 

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 <thread>

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 <future>
 #include <random>

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 {

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 <chrono>

sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp

@@ -6,8 +6,8 @@
 #include <future>
 #include <vector>
 
-#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 {
 

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 {

sdk/storage/azure-storage-blobs/version.txt

@@ -0,0 +1 @@
+1.0.0-beta.1

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})

sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp

@@ -5,9 +5,9 @@
 
 #include <string>
 
-#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 {
 

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 {
 

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 <map>
 #include <memory>

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

sdk/storage/azure-storage-common/sample/main.cpp

@@ -5,11 +5,11 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "samples_common.hpp"
-
 #include <cstdio>
 #include <stdexcept>
 
+#include "samples_common.hpp"
+
 const std::string& GetConnectionString()
 {
   const static std::string c_ConnectionString = "";

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 {
 

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 <Windows.h>
@@ -17,7 +17,7 @@
 
 #include <stdexcept>
 
-#include "common/storage_common.hpp"
+#include "azure/storage/common/storage_common.hpp"
 
 namespace Azure { namespace Storage {
 

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 <fcntl.h>

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;

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 <algorithm>
 #include <cctype>

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"
 

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 <algorithm>
 

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 <type_traits>
 

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 <ctime>
 

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 <algorithm>
 #include <cctype>

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

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"

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 {

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 {

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 <gtest/gtest.h>
 
 #include <chrono>
 #include <limits>

sdk/storage/azure-storage-common/version.txt

@@ -0,0 +1 @@
+1.0.0-beta.1

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

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})

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"

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 <memory>
 #include <string>

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 <memory>
 #include <string>

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 <memory>
 #include <string>

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 <map>
 #include <memory>

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 <memory>
 #include <string>

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 {
 

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 <memory>
 #include <string>

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 <functional>
 #include <iostream>

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 <iostream>
 
+#include "azure/storage/files/datalake/datalake.hpp"
+#include "samples_common.hpp"
+
 SAMPLE(DataLakeGettingStarted, DataLakeGettingStarted)
 void DataLakeGettingStarted()
 {

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 <limits>
 #include <utility> //std::pair

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 <limits>
 #include <utility> //std::pair

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 {

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 <limits>
 #include <utility> //std::pair

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 {
 

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 {

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 {
 

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"
 

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"
 

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 <algorithm>
 

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 {