Feature imagemanager

sonar-project.properties

@@ -36,7 +36,14 @@ sonar.coverage.exclusions=**/tests/**
 # Ignore cpp:S5028 (macros should not define constants) in config.hpp/testconfig.hpp files only:
 # these headers define AOS_CONFIG_* build-time knobs with #ifndef/#define guards so they can be
 # overridden by the build system before this header is included, which constexpr/enum can't do.
-sonar.issue.ignore.multicriteria=e1,e2,e3,e4,e5,e6,e7,e8
+#
+# Ignore cpp:M23_163 (MISRA C++:2023 13.1.1, classes should not be inherited virtually) in the CM
+# and SM database interfaces and the SM image manager storage interface only: DatabaseItf lists all
+# storage interfaces the CM or SM database implements,
+# and the application database implements the image manager storage in a common base class, so
+# StorageItf is inherited virtually to keep a single instance of it in the diamond. StorageItf is
+# a pure interface without data.
+sonar.issue.ignore.multicriteria=e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12
 sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:M23_356
 sonar.issue.ignore.multicriteria.e1.resourceKey=**/*
 sonar.issue.ignore.multicriteria.e2.ruleKey=cpp:S6022
@@ -53,5 +60,13 @@ sonar.issue.ignore.multicriteria.e7.ruleKey=cpp:S5028
 sonar.issue.ignore.multicriteria.e7.resourceKey=**/config.hpp
 sonar.issue.ignore.multicriteria.e8.ruleKey=cpp:S5028
 sonar.issue.ignore.multicriteria.e8.resourceKey=**/testconfig.hpp
+sonar.issue.ignore.multicriteria.e9.ruleKey=cpp:S7032
+sonar.issue.ignore.multicriteria.e9.resourceKey=**/*
+sonar.issue.ignore.multicriteria.e10.ruleKey=cpp:M23_163
+sonar.issue.ignore.multicriteria.e10.resourceKey=**/cm/database/itf/database.hpp
+sonar.issue.ignore.multicriteria.e11.ruleKey=cpp:M23_163
+sonar.issue.ignore.multicriteria.e11.resourceKey=**/sm/database/itf/database.hpp
+sonar.issue.ignore.multicriteria.e12.ruleKey=cpp:M23_163
+sonar.issue.ignore.multicriteria.e12.resourceKey=**/sm/imagemanager/itf/storage.hpp
 
 sonar.ws.timeout=600

src/core/cm/communication/communication.md

@@ -14,7 +14,8 @@ It implements the following interfaces:
   notification;
 * [aos::cm::smcontroller::SenderItf](../smcontroller/itf/sender.hpp) - sends log messages;
 * [aos::cm::launcher::SenderItf](../launcher/itf/senderitf.hpp) - sends override env vars statuses;
-* [aos::cm::imagemanager::BlobInfoProviderItf](../imagemanager/itf/blobinfoprovider.hpp) - provides blobs info.
+* [aos::common::imagemanager::BlobInfoProviderItf](../../common/imagemanager/itf/blobinfoprovider.hpp) - provides
+  blobs info.
 
 It requires the following interfaces:
 
@@ -69,7 +70,7 @@ classDiagram
         <<interface>>
     }
 
-    class BlobInfoProviderItf["aos::cm::imagemanager::BlobInfoProviderItf"] {
+    class BlobInfoProviderItf["aos::common::imagemanager::BlobInfoProviderItf"] {
         <<interface>>
     }
 

src/core/cm/communication/itf/communication.hpp

@@ -8,14 +8,14 @@
 #define AOS_CORE_CM_COMMUNICATION_ITF_COMMUNICATION_HPP_
 
 #include <core/cm/alerts/itf/sender.hpp>
-#include <core/cm/imagemanager/itf/blobinfoprovider.hpp>
 #include <core/cm/launcher/itf/sender.hpp>
 #include <core/cm/monitoring/itf/sender.hpp>
 #include <core/cm/rootcerts/itf/sender.hpp>
 #include <core/cm/smcontroller/itf/sender.hpp>
 #include <core/cm/storagestate/itf/sender.hpp>
 #include <core/cm/updatemanager/itf/sender.hpp>
 #include <core/common/cloudconnection/itf/cloudconnection.hpp>
+#include <core/common/imagemanager/itf/blobinfoprovider.hpp>
 
 namespace aos::cm::communication {
 
@@ -28,7 +28,7 @@ namespace aos::cm::communication {
  */
 class CommunicationItf : public alerts::SenderItf,
                          public launcher::SenderItf,
-                         public imagemanager::BlobInfoProviderItf,
+                         public common::imagemanager::BlobInfoProviderItf,
                          public monitoring::SenderItf,
                          public rootcerts::SenderItf,
                          public smcontroller::SenderItf,

src/core/cm/database/database.md

@@ -4,7 +4,8 @@ The database module provides persistent storage for various CM modules. It imple
 following modules:
 
 - [aos::cm::updatemanager::StorageItf](../updatemanager/itf/storage.hpp) - update manager storage interface;
-- [aos::cm::imagemanager::StorageItf](../imagemanager/itf/storage.hpp) - image manager storage interface;
+- [aos::common::imagemanager::StorageItf](../../common/imagemanager/itf/storage.hpp) - image manager storage interface,
+  inherited virtually so that the implementation may share it with a common image manager storage base class;
 - [aos::cm::launcher::StorageItf](../launcher/itf/storage.hpp) - launcher storage interface;
 - [aos::cm::storagestate::StorageItf](../storagestate/itf/storage.hpp) - storage state storage interface.
 
@@ -18,7 +19,7 @@ classDiagram
         <<interface>>
     }
 
-    class ImageManagerStorageItf ["aos::cm::imagemanager::StorageItf"] {
+    class ImageManagerStorageItf ["aos::common::imagemanager::StorageItf"] {
         <<interface>>
     }
 

src/core/cm/database/itf/database.hpp

@@ -7,10 +7,10 @@
 #ifndef AOS_CORE_CM_DATABASE_ITF_DATABASE_HPP_
 #define AOS_CORE_CM_DATABASE_ITF_DATABASE_HPP_
 
-#include <core/cm/imagemanager/itf/storage.hpp>
 #include <core/cm/launcher/itf/storage.hpp>
 #include <core/cm/storagestate/itf/storage.hpp>
 #include <core/cm/updatemanager/itf/storage.hpp>
+#include <core/common/imagemanager/itf/storage.hpp>
 
 namespace aos::cm::database {
 
@@ -22,7 +22,7 @@ namespace aos::cm::database {
  * Database interface.
  */
 class DatabaseItf : public updatemanager::StorageItf,
-                    public imagemanager::StorageItf,
+                    public virtual common::imagemanager::StorageItf,
                     public launcher::StorageItf,
                     public storagestate::StorageItf { };
 

src/core/cm/imagemanager/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2025 EPAM Systems, Inc.
+# Copyright (C) 2026 EPAM Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,22 +20,20 @@ set(SOURCES imagemanager.cpp)
 # Headers
 # ######################################################################################################################
 
-set(HEADERS
-    config.hpp
-    imagemanager.hpp
-    itf/blobinfoprovider.hpp
-    itf/imagemanager.hpp
-    itf/iteminfoprovider.hpp
-    itf/itemstatusprovider.hpp
-    itf/storage.hpp
-)
+set(HEADERS config.hpp imagemanager.hpp itf/imagemanager.hpp)
 
 # ######################################################################################################################
 # Libraries
 # ######################################################################################################################
 
-set(LIBRARIES aos::core::cm::fileserver aos::core::common::crypto aos::core::common::downloader
-              aos::core::common::ocispec aos::core::common::spaceallocator aos::core::common::tools
+set(LIBRARIES
+    aos::core::cm::fileserver
+    aos::core::common::crypto
+    aos::core::common::downloader
+    aos::core::common::imagemanager
+    aos::core::common::ocispec
+    aos::core::common::spaceallocator
+    aos::core::common::tools
 )
 
 # ######################################################################################################################

src/core/cm/imagemanager/config.hpp

@@ -1,47 +1,21 @@
 /*
- * Copyright (C) 2025 EPAM Systems, Inc.
+ * Copyright (C) 2026 EPAM Systems, Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef AOS_CORE_CM_IMAGEMANAGER_CONFIG_HPP_
 #define AOS_CORE_CM_IMAGEMANAGER_CONFIG_HPP_
 
-#include <core/common/consts.hpp>
-#include <core/common/tools/string.hpp>
+#include <core/common/imagemanager/config.hpp>
 
 namespace aos::cm::imagemanager {
 
 /**
- * Image manager configuration.
+ * CM image manager config.
  */
-struct Config {
-    StaticString<cFilePathLen> mImagePath;
-    size_t                     mPartLimit {};
+struct Config : public common::imagemanager::Config {
     StaticString<cFilePathLen> mDownloadPath;
-    Duration                   mUpdateItemTTL;
-    Duration                   mRemoveOutdatedPeriod;
-
-    /**
-     * Compares config.
-     *
-     * @param other config to compare.
-     * @return bool.
-     */
-    friend bool operator==(const Config& lhs, const Config& other)
-    {
-        return lhs.mImagePath == other.mImagePath && lhs.mPartLimit == other.mPartLimit
-            && lhs.mDownloadPath == other.mDownloadPath && lhs.mUpdateItemTTL == other.mUpdateItemTTL
-            && lhs.mRemoveOutdatedPeriod == other.mRemoveOutdatedPeriod;
-    };
-
-    /**
-     * Compares config.
-     *
-     * @param other config to compare.
-     * @return bool.
-     */
-    friend bool operator!=(const Config& lhs, const Config& other) { return !(lhs == other); };
 };
 
 } // namespace aos::cm::imagemanager