Merge pull request #5348 from npoltorapavlo/RDKTV-30141_main

Rdktv 30141 main
rdkcentral · May 29, 2024 · 91e5806 · 91e5806
2 parents 70c8049 + c89b57d
commit 91e5806
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/PersistentStore/CHANGELOG.md b/PersistentStore/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.12] - 2024-05-29
+### Fixed
+- Switch for account scope feature
+
 ## [1.0.11] - 2024-05-20
 ### Fixed
 - Supply security token with curl json-rpc

diff --git a/PersistentStore/CMakeLists.txt b/PersistentStore/CMakeLists.txt
@@ -33,6 +33,7 @@ set(PLUGIN_PERSISTENTSTORE_MAXVALUE "3000" CACHE STRING "For single text data, i
 set(PLUGIN_PERSISTENTSTORE_LIMIT "10000" CACHE STRING "Default for all text data in namespace, in bytes")
 set(PLUGIN_PERSISTENTSTORE_TOKEN_COMMAND "" CACHE STRING "Shell command to get the service access token")
 set(PLUGIN_PERSISTENTSTORE_STARTUPORDER "" CACHE STRING "To configure startup order of PersistentStore plugin")
+set(PLUGIN_PERSISTENTSTORE_WITH_ACCOUNT_SCOPE true CACHE BOOL "Enable account scope")
 
 add_library(${MODULE_NAME} SHARED
         PersistentStore.cpp
@@ -61,7 +62,6 @@ install(TARGETS ${MODULE_NAME}
 set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
 add_library(${PLUGIN_IMPLEMENTATION} SHARED
         sqlite/Store2.cpp
-        grpc/Store2.cpp
         Module.cpp
 )
 
@@ -83,26 +83,30 @@ if (IARMBUS_LIBRARIES)
     target_compile_definitions(${PLUGIN_IMPLEMENTATION} PRIVATE WITH_SYSMGR)
 endif ()
 
-find_package(Protobuf REQUIRED)
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${Protobuf_LIBRARIES})
-
-add_custom_target(protoc
-        ${Protobuf_PROTOC_EXECUTABLE} --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage/secure_storage.proto
-)
-add_dependencies(${PLUGIN_IMPLEMENTATION} protoc)
-
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE grpc++)
-find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
-
-add_custom_target(protoc-gen-grpc
-        ${Protobuf_PROTOC_EXECUTABLE} --grpc_out ${CMAKE_CURRENT_BINARY_DIR} --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} -I ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage/secure_storage.proto
-)
-add_dependencies(${PLUGIN_IMPLEMENTATION} protoc-gen-grpc)
-
-set(PROTO_SRCS secure_storage.pb.cc secure_storage.grpc.pb.cc)
-target_sources(${PLUGIN_IMPLEMENTATION} PRIVATE ${PROTO_SRCS})
-set_property(SOURCE ${PROTO_SRCS} PROPERTY GENERATED 1)
-target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+if (PLUGIN_PERSISTENTSTORE_WITH_ACCOUNT_SCOPE)
+    target_sources(${PLUGIN_IMPLEMENTATION} PRIVATE grpc/Store2.cpp)
+    find_package(Protobuf REQUIRED)
+    target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${Protobuf_LIBRARIES})
+
+    add_custom_target(protoc
+            ${Protobuf_PROTOC_EXECUTABLE} --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage/secure_storage.proto
+    )
+    add_dependencies(${PLUGIN_IMPLEMENTATION} protoc)
+
+    target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE grpc++)
+    find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
+
+    add_custom_target(protoc-gen-grpc
+            ${Protobuf_PROTOC_EXECUTABLE} --grpc_out ${CMAKE_CURRENT_BINARY_DIR} --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} -I ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/grpc/secure_storage/secure_storage.proto
+    )
+    add_dependencies(${PLUGIN_IMPLEMENTATION} protoc-gen-grpc)
+
+    set(PROTO_SRCS secure_storage.pb.cc secure_storage.grpc.pb.cc)
+    target_sources(${PLUGIN_IMPLEMENTATION} PRIVATE ${PROTO_SRCS})
+    set_property(SOURCE ${PROTO_SRCS} PROPERTY GENERATED 1)
+    target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+    target_compile_definitions(${PLUGIN_IMPLEMENTATION} PRIVATE WITH_ACCOUNT_SCOPE)
+endif ()
 
 install(TARGETS ${PLUGIN_IMPLEMENTATION}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp
@@ -25,7 +25,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 11
+#define API_VERSION_NUMBER_PATCH 12
 
 namespace WPEFramework {