fixed the post-merge compilation.

canonical · Oct 18, 2024 · 9323388 · 9323388
1 parent ac429f7
commit 9323388
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 2 deletions.
diff --git a/include/multipass/virtual_machine_factory.h b/include/multipass/virtual_machine_factory.h
@@ -55,6 +55,7 @@ class VirtualMachineFactory : private DisabledCopyMove
                                                                   const std::string& source_name,
                                                                   const std::string& destination_name,
                                                                   const VMImage& dest_vm_image,
+                                                                  const SSHKeyProvider& key_provider,
                                                                   VMStatusMonitor& monitor) = 0;
 
     /** Removes any resources associated with a VM of the given name.

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -2798,6 +2798,7 @@ void mp::Daemon::clone(const CloneRequest* request,
                                                                   source_name,
                                                                   destination_name,
                                                                   dest_vm_image,
+                                                                  *config->ssh_key_provider,
                                                                   *this);
             ++src_spec.clone_count;
             persist_instances();

diff --git a/src/platform/backends/qemu/qemu_virtual_machine_factory.cpp b/src/platform/backends/qemu/qemu_virtual_machine_factory.cpp
@@ -25,6 +25,7 @@
 #include <multipass/process/simple_process_spec.h>
 #include <multipass/virtual_machine_description.h>
 #include <multipass/vm_specs.h>
+#include <multipass/yaml_node_utils.h>
 
 #include <shared/qemu_img_utils/qemu_img_utils.h>
 
@@ -70,6 +71,7 @@ mp::VirtualMachine::UPtr mp::QemuVirtualMachineFactory::create_vm_and_instance_d
     const std::string& source_name,
     const std::string& destination_name,
     const VMImage& dest_vm_image,
+    const SSHKeyProvider& key_provider,
     VMStatusMonitor& monitor)
 {
     const QString backend_data_direcotry =
@@ -126,7 +128,7 @@ mp::VirtualMachine::UPtr mp::QemuVirtualMachineFactory::create_vm_and_instance_d
                                                {},
                                                {}};
 
-    mp::VirtualMachine::UPtr cloned_instance = create_virtual_machine(dest_vm_desc, monitor);
+    mp::VirtualMachine::UPtr cloned_instance = create_virtual_machine(dest_vm_desc, key_provider, monitor);
     cloned_instance->load_snapshots_and_update_unique_identifiers(src_vm_spec, dest_vm_spec, source_name);
 
     rollback.dismiss();

diff --git a/src/platform/backends/qemu/qemu_virtual_machine_factory.h b/src/platform/backends/qemu/qemu_virtual_machine_factory.h
@@ -42,6 +42,7 @@ class QemuVirtualMachineFactory final : public BaseVirtualMachineFactory
                                                           const std::string& source_name,
                                                           const std::string& destination_name,
                                                           const VMImage& dest_vm_image,
+                                                          const SSHKeyProvider& key_provider,
                                                           VMStatusMonitor& monitor) override;
 
     VMImage prepare_source_image(const VMImage& source_image) override;

diff --git a/src/platform/backends/shared/base_virtual_machine_factory.h b/src/platform/backends/shared/base_virtual_machine_factory.h
@@ -41,6 +41,7 @@ class BaseVirtualMachineFactory : public VirtualMachineFactory
                                                           const std::string& source_name,
                                                           const std::string& destination_name,
                                                           const VMImage& dest_vm_image,
+                                                          const SSHKeyProvider& key_provider,
                                                           VMStatusMonitor& monitor) override
     {
         throw NotImplementedOnThisBackendException("clone");

diff --git a/tests/mock_virtual_machine_factory.h b/tests/mock_virtual_machine_factory.h
@@ -43,6 +43,7 @@ struct MockVirtualMachineFactory : public VirtualMachineFactory
                  const std::string&,
                  const std::string&,
                  const VMImage&,
+                 const SSHKeyProvider&,
                  VMStatusMonitor&),
                 (override));
     MOCK_METHOD(void, remove_resources_for, (const std::string&), (override));

diff --git a/tests/stub_virtual_machine_factory.h b/tests/stub_virtual_machine_factory.h
@@ -52,6 +52,7 @@ struct StubVirtualMachineFactory : public multipass::BaseVirtualMachineFactory
                                                                      const std::string& source_name,
                                                                      const std::string& destination_name,
                                                                      const VMImage& dest_vm_image,
+                                                                     const SSHKeyProvider& key_provider,
                                                                      VMStatusMonitor& monitor) override
     {
         return std::make_unique<StubVirtualMachine>();

diff --git a/tests/test_base_virtual_machine_factory.cpp b/tests/test_base_virtual_machine_factory.cpp
@@ -59,6 +59,7 @@ struct MockBaseFactory : mp::BaseVirtualMachineFactory
                  const std::string&,
                  const std::string&,
                  const mp::VMImage&,
+                 const mp::SSHKeyProvider&,
                  mp::VMStatusMonitor&),
                 (override));
     MOCK_METHOD(mp::VMImage, prepare_source_image, (const mp::VMImage&), (override));

diff --git a/tests/test_cloud_init_iso.cpp b/tests/test_cloud_init_iso.cpp
@@ -90,7 +90,7 @@ TEST_F(CloudInitIso, check_at_operator_throw)
     MP_EXPECT_THROW_THAT(
         iso.at("non_exist_file"),
         std::runtime_error,
-        mpt::match_what(StrEq("Did not find the target file non_exist_file in the CloudInitIso instance.")));
+        mpt::match_what(StrEq("Did not find the target file non_exist_file in the CloudInitIso instance. ")));
 }
 
 TEST_F(CloudInitIso, check_at_operator_found_key)