From daa36f1650865fd4cd4c445233b9a72909ca3db6 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 27 Sep 2023 10:16:15 -0700 Subject: [PATCH] Renamed blob checkpointstore to long name (#4990) * Renamed blob checkpointstore to long name * Moved unit tests into ut directory * Re-ran recordings --- sdk/eventhubs/CMakeLists.txt | 3 +-- sdk/eventhubs/assets.json | 2 +- .../CHANGELOG.md | 0 .../CMakeLists.txt | 2 +- .../LICENSE | 0 .../README.md | 0 .../inc/ApiViewSettings.json | 0 .../checkpointstore_blob/blob_checkpoint_store.hpp | 0 .../checkpointstore_blob/dll_import_export.hpp | 0 .../eventhubs/checkpointstore_blob/rtti.hpp | 0 .../src/blob_checkpoint_store.cpp | 0 .../src/private/package_version.hpp | 0 .../test/CMakeLists.txt | 12 ++++++++++++ .../test/ut}/CMakeLists.txt | 0 .../test/ut}/blob_checkpoint_store_test.cpp | 0 .../test/ut}/eventhubs_test_base.hpp | 0 .../vcpkg.json | 0 .../vcpkg/Config.cmake.in | 0 .../vcpkg/portfile.cmake | 10 ++++++++++ .../vcpkg/vcpkg.json | 0 sdk/eventhubs/ci.yml | 4 ++-- 21 files changed, 27 insertions(+), 6 deletions(-) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/CHANGELOG.md (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/CMakeLists.txt (97%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/LICENSE (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/README.md (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/inc/ApiViewSettings.json (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/src/blob_checkpoint_store.cpp (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/src/private/package_version.hpp (100%) create mode 100644 sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/CMakeLists.txt rename sdk/eventhubs/{blob-store/test => azure-messaging-eventhubs-checkpointstore-blob/test/ut}/CMakeLists.txt (100%) rename sdk/eventhubs/{blob-store/test => azure-messaging-eventhubs-checkpointstore-blob/test/ut}/blob_checkpoint_store_test.cpp (100%) rename sdk/eventhubs/{blob-store/test => azure-messaging-eventhubs-checkpointstore-blob/test/ut}/eventhubs_test_base.hpp (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/vcpkg.json (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/vcpkg/Config.cmake.in (100%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/vcpkg/portfile.cmake (56%) rename sdk/eventhubs/{blob-store => azure-messaging-eventhubs-checkpointstore-blob}/vcpkg/vcpkg.json (100%) diff --git a/sdk/eventhubs/CMakeLists.txt b/sdk/eventhubs/CMakeLists.txt index b46be0b3d..ab5929974 100644 --- a/sdk/eventhubs/CMakeLists.txt +++ b/sdk/eventhubs/CMakeLists.txt @@ -9,5 +9,4 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) add_subdirectory(azure-messaging-eventhubs) -#add_subdirectory(azure-messaging-eventhubs-checkpointstore-blob) -add_subdirectory(blob-store) +add_subdirectory(azure-messaging-eventhubs-checkpointstore-blob) diff --git a/sdk/eventhubs/assets.json b/sdk/eventhubs/assets.json index 47e6227bc..b1385467b 100644 --- a/sdk/eventhubs/assets.json +++ b/sdk/eventhubs/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "cpp", "TagPrefix": "cpp/eventhubs", - "Tag": "cpp/eventhubs_d59a0a9f3c" + "Tag": "cpp/eventhubs_ab9d97a1b9" } diff --git a/sdk/eventhubs/blob-store/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md similarity index 100% rename from sdk/eventhubs/blob-store/CHANGELOG.md rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md diff --git a/sdk/eventhubs/blob-store/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt similarity index 97% rename from sdk/eventhubs/blob-store/CMakeLists.txt rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt index 1ba590b6a..54e8dfafe 100644 --- a/sdk/eventhubs/blob-store/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt @@ -88,7 +88,7 @@ create_code_coverage(eventhubs azure-messaging-eventhubs-checkpoint-blob azure-m get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") #generate_documentation(azure-messaging-eventhubs-checkpoint-blob ${AZ_LIBRARY_VERSION}) -generate_documentation(blob-store ${AZ_LIBRARY_VERSION}) +generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) if(BUILD_TESTING) add_subdirectory(test) diff --git a/sdk/eventhubs/blob-store/LICENSE b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/LICENSE similarity index 100% rename from sdk/eventhubs/blob-store/LICENSE rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/LICENSE diff --git a/sdk/eventhubs/blob-store/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md similarity index 100% rename from sdk/eventhubs/blob-store/README.md rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md diff --git a/sdk/eventhubs/blob-store/inc/ApiViewSettings.json b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/ApiViewSettings.json similarity index 100% rename from sdk/eventhubs/blob-store/inc/ApiViewSettings.json rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/ApiViewSettings.json diff --git a/sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp similarity index 100% rename from sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp diff --git a/sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp similarity index 100% rename from sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp diff --git a/sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp similarity index 100% rename from sdk/eventhubs/blob-store/inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp diff --git a/sdk/eventhubs/blob-store/src/blob_checkpoint_store.cpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/src/blob_checkpoint_store.cpp similarity index 100% rename from sdk/eventhubs/blob-store/src/blob_checkpoint_store.cpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/src/blob_checkpoint_store.cpp diff --git a/sdk/eventhubs/blob-store/src/private/package_version.hpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/src/private/package_version.hpp similarity index 100% rename from sdk/eventhubs/blob-store/src/private/package_version.hpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/src/private/package_version.hpp diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/CMakeLists.txt new file mode 100644 index 000000000..df104b973 --- /dev/null +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. + +# CMakeList.txt : Top-level CMake project file, do global configuration +# and include sub-projects here. +# +cmake_minimum_required (VERSION 3.13) + +# Include sub-projects. + +# General AMQP Unit tests. +add_subdirectory ("ut") diff --git a/sdk/eventhubs/blob-store/test/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt similarity index 100% rename from sdk/eventhubs/blob-store/test/CMakeLists.txt rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt diff --git a/sdk/eventhubs/blob-store/test/blob_checkpoint_store_test.cpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/blob_checkpoint_store_test.cpp similarity index 100% rename from sdk/eventhubs/blob-store/test/blob_checkpoint_store_test.cpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/blob_checkpoint_store_test.cpp diff --git a/sdk/eventhubs/blob-store/test/eventhubs_test_base.hpp b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/eventhubs_test_base.hpp similarity index 100% rename from sdk/eventhubs/blob-store/test/eventhubs_test_base.hpp rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/eventhubs_test_base.hpp diff --git a/sdk/eventhubs/blob-store/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg.json similarity index 100% rename from sdk/eventhubs/blob-store/vcpkg.json rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg.json diff --git a/sdk/eventhubs/blob-store/vcpkg/Config.cmake.in b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/Config.cmake.in similarity index 100% rename from sdk/eventhubs/blob-store/vcpkg/Config.cmake.in rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/Config.cmake.in diff --git a/sdk/eventhubs/blob-store/vcpkg/portfile.cmake b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake similarity index 56% rename from sdk/eventhubs/blob-store/vcpkg/portfile.cmake rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake index bbee285d0..fc02456ae 100644 --- a/sdk/eventhubs/blob-store/vcpkg/portfile.cmake +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake @@ -8,6 +8,16 @@ vcpkg_from_github( SHA512 0 ) +if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob" "${SOURCE_PATH}/sdk/eventhubs/_") + file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/" OPTIONS diff --git a/sdk/eventhubs/blob-store/vcpkg/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json similarity index 100% rename from sdk/eventhubs/blob-store/vcpkg/vcpkg.json rename to sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json diff --git a/sdk/eventhubs/ci.yml b/sdk/eventhubs/ci.yml index 15099ff17..ca060b372 100644 --- a/sdk/eventhubs/ci.yml +++ b/sdk/eventhubs/ci.yml @@ -37,14 +37,14 @@ stages: Path: azure-messaging-eventhubs VcpkgPortName: azure-messaging-eventhubs-cpp - Name: azure-messaging-eventhubs-checkpointstore-blob - Path: blob-store + Path: azure-messaging-eventhubs-checkpointstore-blob VcpkgPortName: azure-messaging-eventhubs-checkpointstore-blob-cpp ArtifactsSource: - Name: azure-messaging-eventhubs Path: azure-messaging-eventhubs VcpkgPortName: azure-messaging-eventhubs-cpp - Name: azure-messaging-eventhubs-checkpointstore-blob - Path: blob-store + Path: azure-messaging-eventhubs-checkpointstore-blob VcpkgPortName: azure-messaging-eventhubs-checkpointstore-blob-cpp TestEnv: - Name: AZURE_TENANT_ID