test

rdkcentral · Feb 21, 2024 · a63ed7d · a63ed7d
1 parent 36ab244
commit a63ed7d
Show file tree

Hide file tree

Showing 58 changed files with 3,493 additions and 2,371 deletions.
diff --git a/.github/workflows/L0-PersistentStore-grpc.yml b/.github/workflows/L0-PersistentStore-grpc.yml
@@ -0,0 +1,53 @@
+name: L0-PersistentStore-grpc
+
+on:
+  push:
+    paths:
+      - PersistentStore/grpc/**
+  pull_request:
+    paths:
+      - PersistentStore/grpc/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+
+      - name: Install valgrind, coverage, cmake, protoc, grpc_cpp_plugin, grpc
+        run: |
+          sudo apt update
+          sudo apt install -y valgrind lcov cmake protobuf-compiler protobuf-compiler-grpc libgrpc++-dev
+
+      - name: Build Thunder
+        working-directory: ${{github.workspace}}
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
+
+      - name: Build
+        working-directory: ${{github.workspace}}
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore/grpc/l0test -B build/grpcl0test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+          cmake --build build/grpcl0test --target install
+
+      - name: Run
+        working-directory: ${{github.workspace}}
+        run: PATH=${PWD}/install/usr/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/usr/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try grpcl0test
+
+      - name: Generate coverage
+        working-directory: ${{github.workspace}}
+        run: |
+          lcov -c -o coverage.info -d build/grpcl0test
+          genhtml -o coverage coverage.info
+
+      - name: Upload artifacts
+        if: ${{ !env.ACT }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts
+          path: |
+            coverage/
+            valgrind_log
+          if-no-files-found: warn
diff --git a/.github/workflows/L0-PersistentStore.yml b/.github/workflows/L0-PersistentStore.yml
@@ -0,0 +1,53 @@
+name: L0-PersistentStore
+
+on:
+  push:
+    paths:
+      - PersistentStore/**
+  pull_request:
+    paths:
+      - PersistentStore/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+
+      - name: Install valgrind, coverage, cmake
+        run: |
+          sudo apt update
+          sudo apt install -y valgrind lcov cmake
+
+      - name: Build Thunder
+        working-directory: ${{github.workspace}}
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
+
+      - name: Build
+        working-directory: ${{github.workspace}}
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l0test -B build/persistentstorel0test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+          cmake --build build/persistentstorel0test --target install
+
+      - name: Run
+        working-directory: ${{github.workspace}}
+        run: PATH=${PWD}/install/usr/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/usr/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try persistentstorel0test
+
+      - name: Generate coverage
+        working-directory: ${{github.workspace}}
+        run: |
+          lcov -c -o coverage.info -d build/persistentstorel0test
+          genhtml -o coverage coverage.info
+
+      - name: Upload artifacts
+        if: ${{ !env.ACT }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts
+          path: |
+            coverage/
+            valgrind_log
+          if-no-files-found: warn
diff --git a/.github/workflows/L1-Sqlite.yml → ...b/workflows/L1-PersistentStore-sqlite.yml b/.github/workflows/L1-Sqlite.yml → ...b/workflows/L1-PersistentStore-sqlite.yml
@@ -1,4 +1,4 @@
-name: L1-Sqlite
+name: L1-PersistentStore-sqlite
 
 on:
   push:
@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          path: rdkservices
+          path: ${{github.repository}}
 
       - name: Install valgrind, coverage, cmake, sqlite
         run: |
@@ -24,15 +24,13 @@ jobs:
 
       - name: Build Thunder
         working-directory: ${{github.workspace}}
-        run: sh +x rdkservices/.github/workflows/BuildThunder.sh
-
-      - name: Configure
-        working-directory: ${{github.workspace}}
-        run: cmake -S rdkservices/PersistentStore/sqlite/l1test -B build/sqlitel1test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
 
       - name: Build
         working-directory: ${{github.workspace}}
-        run: cmake --build build/sqlitel1test --target install
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore/sqlite/l1test -B build/sqlitel1test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+          cmake --build build/sqlitel1test --target install
 
       - name: Run
         working-directory: ${{github.workspace}}
@@ -46,10 +44,10 @@ jobs:
 
       - name: Upload artifacts
         if: ${{ !env.ACT }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: |
             coverage/
             valgrind_log
-          if-no-files-found: warn
+          if-no-files-found: warn
diff --git a/.github/workflows/L1-PersistentStore.yml b/.github/workflows/L1-PersistentStore.yml
@@ -13,26 +13,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          path: rdkservices
+          path: ${{github.repository}}
 
-      - name: Install valgrind, coverage, cmake, sqlite
+      - name: Install valgrind, coverage, cmake
         run: |
           sudo apt update
-          sudo apt install -y valgrind lcov cmake libsqlite3-dev
+          sudo apt install -y valgrind lcov cmake
 
       - name: Build Thunder
         working-directory: ${{github.workspace}}
-        run: sh +x rdkservices/.github/workflows/BuildThunder.sh
-
-      - name: Configure
-        working-directory: ${{github.workspace}}
-        run: cmake -S rdkservices/PersistentStore/l1test -B build/persistentstorel1test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
 
       - name: Build
         working-directory: ${{github.workspace}}
-        run: cmake --build build/persistentstorel1test --target install
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l1test -B build/persistentstorel1test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
+          cmake --build build/persistentstorel1test --target install
 
       - name: Run
         working-directory: ${{github.workspace}}
@@ -46,10 +44,10 @@ jobs:
 
       - name: Upload artifacts
         if: ${{ !env.ACT }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: |
             coverage/
             valgrind_log
-          if-no-files-found: warn
+          if-no-files-found: warn
diff --git a/.github/workflows/L2-PersistentStore-grpc.yml b/.github/workflows/L2-PersistentStore-grpc.yml
@@ -0,0 +1,29 @@
+name: L2-PersistentStore-grpc
+
+on:
+  push:
+    paths:
+      - PersistentStore/grpc/secure_storage.proto
+  pull_request:
+    paths:
+      - PersistentStore/grpc/secure_storage.proto
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+
+      - name: Install cmake, protoc, grpc_cpp_plugin, grpc
+        run: |
+          sudo apt update
+          sudo apt install -y cmake protobuf-compiler protobuf-compiler-grpc libgrpc++-dev
+
+      - name: Build
+        working-directory: ${{github.workspace}}
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore/grpc/l2test -B build/grpcl2test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="-Wall -Werror"
+          cmake --build build/grpcl2test --target install
diff --git a/PersistentStore/CMakeLists.txt b/PersistentStore/CMakeLists.txt
@@ -15,19 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cmake_minimum_required(VERSION 3.14)
+
 project(PersistentStore)
 
-cmake_minimum_required(VERSION 3.3)
+set(CMAKE_CXX_STANDARD 11)
 
 find_package(WPEFramework)
-
-project_version(1.0.0)
-
-set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME})
-
-message("Setup ${MODULE_NAME} v${PROJECT_VERSION}")
+set(MODULE_NAME "${NAMESPACE}${PROJECT_NAME}")
 
 set(PLUGIN_PERSISTENTSTORE_MODE "Off" CACHE STRING "Controls if the plugin should run in its own process, in process or remote")
+set(PLUGIN_PERSISTENTSTORE_URI "ss.eu.prod.developer.comcast.com:443" CACHE STRING "Account scope endpoint")
 set(PLUGIN_PERSISTENTSTORE_PATH "/opt/secure/persistent/rdkservicestore" CACHE STRING "Path")
 set(PLUGIN_PERSISTENTSTORE_LEGACYPATH "/opt/persistent/rdkservicestore" CACHE STRING "Previously used path")
 set(PLUGIN_PERSISTENTSTORE_KEY "" CACHE STRING "Encryption key")
@@ -39,46 +37,85 @@ set(PLUGIN_PERSISTENTSTORE_STARTUPORDER "" CACHE STRING "To configure startup or
 find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
 
+add_library(${MODULE_NAME} SHARED
+        PersistentStore.cpp
+        PersistentStoreJsonRpc.cpp
+        grpc/Store2.cpp
+        sqlite/Store2.cpp
+        sqlite/StoreCache.cpp
+        sqlite/StoreInspector.cpp
+        sqlite/StoreLimit.cpp
+        Module.cpp
+)
+
+target_link_libraries(${MODULE_NAME} PRIVATE
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${NAMESPACE}Definitions::${NAMESPACE}Definitions
+)
+
 find_package(PkgConfig REQUIRED)
 pkg_search_module(SQLITE REQUIRED sqlite3)
+target_link_libraries(${MODULE_NAME} PRIVATE ${SQLITE_LIBRARIES})
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
-
 if (IARMBUS_LIBRARIES)
-    message("Building with IARMBus")
-    add_definitions(-DWITH_CLOCK_SYNC)
     find_path(IARMBUS_INCLUDE_DIRS NAMES libIBus.h PATH_SUFFIXES rdk/iarmbus REQUIRED)
     find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr REQUIRED)
+    target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS})
+    target_link_libraries(${MODULE_NAME} PRIVATE ${IARMBUS_LIBRARIES})
+    add_definitions(-DWITH_SYSMGR)
 endif ()
 
-add_library(${MODULE_NAME} SHARED
-        PersistentStore.cpp
-        PersistentStoreJsonRpc.cpp
-        sqlite/Handle.cpp
-        Module.cpp
-        )
-
-set_target_properties(${MODULE_NAME} PROPERTIES
-        CXX_STANDARD 11
-        CXX_STANDARD_REQUIRED YES
-        )
-
-add_definitions(${SQLITE_CFLAGS_OTHER})
-link_directories(${SQLITE_LIBRARY_DIRS})
-
-target_include_directories(${MODULE_NAME} PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        ${SQLITE_INCLUDE_DIRS}
-        ${IARMBUS_INCLUDE_DIRS}
-        ${IARMSYS_INCLUDE_DIRS}
-        )
-
-target_link_libraries(${MODULE_NAME} PRIVATE
-        ${NAMESPACE}Plugins::${NAMESPACE}Plugins
-        ${NAMESPACE}Definitions::${NAMESPACE}Definitions
-        ${SQLITE_LIBRARIES}
-        ${IARMBUS_LIBRARIES}
-        )
+include(FetchContent)
+FetchContent_Declare(
+        validate
+        GIT_REPOSITORY https://github.com/bufbuild/protoc-gen-validate.git
+        GIT_TAG v1.0.4
+)
+FetchContent_Declare(
+        googleapis
+        GIT_REPOSITORY https://github.com/googleapis/googleapis.git
+        GIT_TAG master
+)
+FetchContent_MakeAvailable(validate googleapis)
+
+find_package(Protobuf REQUIRED)
+protobuf_generate(
+        OUT_VAR PB_CC
+        PROTOS ${validate_SOURCE_DIR}/validate/validate.proto ${googleapis_SOURCE_DIR}/google/api/field_behavior.proto grpc/secure_storage.proto
+        PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}
+        IMPORT_DIRS ${validate_SOURCE_DIR} ${googleapis_SOURCE_DIR} grpc
+)
+add_custom_target(pb_cc DEPENDS ${PB_CC})
+add_dependencies(${MODULE_NAME} pb_cc)
+target_sources(${MODULE_NAME} PRIVATE validate/validate.pb.cc google/api/field_behavior.pb.cc grpc/secure_storage.pb.cc)
+set_property(SOURCE validate/validate.pb.cc google/api/field_behavior.pb.cc grpc/secure_storage.pb.cc PROPERTY GENERATED 1)
+target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/grpc)
+target_link_libraries(${MODULE_NAME} PRIVATE ${Protobuf_LIBRARIES})
+
+find_package(gRPC CONFIG)
+if (NOT gRPC_FOUND)
+    find_package(PkgConfig REQUIRED)
+    pkg_search_module(gRPC REQUIRED grpc)
+endif ()
+find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
+protobuf_generate(
+        OUT_VAR GRPC_PB_CC
+        PROTOS grpc/secure_storage.proto
+        PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}
+        IMPORT_DIRS grpc ${validate_SOURCE_DIR} ${googleapis_SOURCE_DIR}
+        LANGUAGE grpc
+        PLUGIN protoc-gen-grpc=${GRPC_CPP_PLUGIN}
+        GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc
+)
+add_custom_target(grpc_pb_cc DEPENDS ${GRPC_PB_CC})
+add_dependencies(${MODULE_NAME} grpc_pb_cc)
+add_dependencies(grpc_pb_cc pb_cc)
+target_sources(${MODULE_NAME} PRIVATE grpc/secure_storage.grpc.pb.cc)
+set_property(SOURCE grpc/secure_storage.grpc.pb.cc PROPERTY GENERATED 1)
+target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/grpc)
+target_link_libraries(${MODULE_NAME} PRIVATE grpc++)
+target_link_options(${MODULE_NAME} PRIVATE "LINKER:--copy-dt-needed-entries")
 
 install(TARGETS ${MODULE_NAME}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

diff --git a/PersistentStore/Module.h b/PersistentStore/Module.h
@@ -29,5 +29,12 @@
 #include <interfaces/definitions.h>
 #endif
 
+#define URI_ENV "PERSISTENTSTORE_URI"
+#define PATH_ENV "PERSISTENTSTORE_PATH"
+#define MAXSIZE_ENV "PERSISTENTSTORE_MAXSIZE"
+#define MAXVALUE_ENV "PERSISTENTSTORE_MAXVALUE"
+#define LIMIT_ENV "PERSISTENTSTORE_LIMIT"
+#define IARM_INIT_NAME "Thunder_Plugins"
+
 #undef EXTERNAL
 #define EXTERNAL