Merge pull request #3695 from canonical/default-mount-target-in-daemon

[daemon] let daemon choose mount target if not specified
canonical · Oct 21, 2024 · 316af44 · 316af44
2 parents ea024df + a7b3f43
commit 316af44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/include/multipass/utils.h b/include/multipass/utils.h
@@ -235,6 +235,8 @@ class Utils : public Singleton<Utils>
     virtual QString make_uuid(const std::optional<std::string>& seed = std::nullopt) const;
     virtual void sleep_for(const std::chrono::milliseconds& ms) const;
     virtual bool is_ipv4_valid(const std::string& ipv4) const;
+
+    virtual Path default_mount_target(const Path& source) const;
 };
 } // namespace multipass
 

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -1924,7 +1924,10 @@ try // clang-format on
     for (const auto& path_entry : request->target_paths())
     {
         const auto& name = path_entry.instance_name();
-        const auto target_path = QDir::cleanPath(QString::fromStdString(path_entry.target_path())).toStdString();
+        const auto q_target_path = path_entry.target_path().empty()
+                                       ? MP_UTILS.default_mount_target(QString::fromStdString(request->source_path()))
+                                       : QDir::cleanPath(QString::fromStdString(path_entry.target_path()));
+        const auto target_path = q_target_path.toStdString();
 
         auto it = operative_instances.find(name);
         if (it == operative_instances.end())
@@ -1934,7 +1937,7 @@ try // clang-format on
         }
         auto& vm = it->second;
 
-        if (mp::utils::invalid_target_path(QString::fromStdString(target_path)))
+        if (mp::utils::invalid_target_path(q_target_path))
         {
             add_fmt_to(errors, "unable to mount to \"{}\"", target_path);
             continue;

diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -582,6 +582,11 @@ bool mp::Utils::is_ipv4_valid(const std::string& ipv4) const
     return true;
 }
 
+mp::Path mp::Utils::default_mount_target(const Path& source) const
+{
+    return source.isEmpty() ? "" : QDir{QDir::cleanPath(source)}.dirName().prepend("/home/ubuntu/");
+}
+
 auto mp::utils::find_bridge_with(const std::vector<mp::NetworkInterfaceInfo>& networks,
                                  const std::string& target_network,
                                  const std::string& bridge_type) -> std::optional<mp::NetworkInterfaceInfo>

diff --git a/tests/mock_utils.h b/tests/mock_utils.h
@@ -52,6 +52,7 @@ class MockUtils : public Utils
     MOCK_METHOD(QString, make_uuid, (const std::optional<std::string>&), (const, override));
     MOCK_METHOD(void, sleep_for, (const std::chrono::milliseconds&), (const, override));
     MOCK_METHOD(bool, is_ipv4_valid, (const std::string& ipv4), (const, override));
+    MOCK_METHOD(Path, default_mount_target, (const Path& source), (const, override));
 
     MP_MOCK_SINGLETON_BOILERPLATE(MockUtils, Utils);
 };