[vm image] improve one function parameter name.

canonical · May 8, 2024 · f328b81 · f328b81
1 parent 4b99bc9
commit f328b81
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/include/multipass/vm_image_vault.h b/include/multipass/vm_image_vault.h
@@ -93,7 +93,7 @@ class VMImageVault : private DisabledCopyMove
     virtual void update_images(const FetchType& fetch_type, const PrepareAction& prepare,
                                const ProgressMonitor& monitor) = 0;
     virtual MemorySize minimum_image_size_for(const std::string& id) = 0;
-    virtual void clone(const std::string& source_instance_name, const std::string& dist_instance_name) = 0;
+    virtual void clone(const std::string& source_instance_name, const std::string& destination_instance_name) = 0;
     virtual VMImageHost* image_host_for(const std::string& remote_name) const = 0;
     virtual std::vector<std::pair<std::string, VMImageInfo>> all_info_for(const Query& query) const = 0;
 

diff --git a/src/daemon/default_vm_image_vault.cpp b/src/daemon/default_vm_image_vault.cpp
@@ -582,7 +582,8 @@ mp::MemorySize mp::DefaultVMImageVault::minimum_image_size_for(const std::string
 
     throw std::runtime_error(fmt::format("Cannot determine minimum image size for id \'{}\'", id));
 }
-void mp::DefaultVMImageVault::clone(const std::string& source_instance_name, const std::string& dist_instance_name)
+void mp::DefaultVMImageVault::clone(const std::string& source_instance_name,
+                                    const std::string& destination_instance_name)
 {
     const auto source_iter = instance_image_records.find(source_instance_name);
 
@@ -591,13 +592,14 @@ void mp::DefaultVMImageVault::clone(const std::string& source_instance_name, con
         throw std::runtime_error(source_instance_name + " does not exist in the image records");
     }
 
-    if (instance_image_records.find(dist_instance_name) != instance_image_records.end())
+    if (instance_image_records.find(destination_instance_name) != instance_image_records.end())
     {
-        throw std::runtime_error(dist_instance_name + " already exists in the image records");
+        throw std::runtime_error(destination_instance_name + " already exists in the image records");
     }
 
-    auto& dest_vault_record = instance_image_records[dist_instance_name] = instance_image_records[source_instance_name];
-    dest_vault_record.image.image_path.replace(source_instance_name.c_str(), dist_instance_name.c_str());
+    auto& dest_vault_record = instance_image_records[destination_instance_name] =
+        instance_image_records[source_instance_name];
+    dest_vault_record.image.image_path.replace(source_instance_name.c_str(), destination_instance_name.c_str());
     // change last accessed?
     persist_instance_records();
 }

diff --git a/src/daemon/default_vm_image_vault.h b/src/daemon/default_vm_image_vault.h
@@ -65,7 +65,7 @@ class DefaultVMImageVault final : public BaseVMImageVault
     void update_images(const FetchType& fetch_type, const PrepareAction& prepare,
                        const ProgressMonitor& monitor) override;
     MemorySize minimum_image_size_for(const std::string& id) override;
-    void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override;
+    void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override;
 
 private:
     VMImage image_instance_from(const VMImage& prepared_image, const Path& dest_dir);

diff --git a/src/platform/backends/lxd/lxd_vm_image_vault.h b/src/platform/backends/lxd/lxd_vm_image_vault.h
@@ -52,7 +52,7 @@ class LXDVMImageVault final : public BaseVMImageVault
     void update_images(const FetchType& fetch_type, const PrepareAction& prepare,
                        const ProgressMonitor& monitor) override;
     MemorySize minimum_image_size_for(const std::string& id) override;
-    void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override
+    void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override
     {
         throw std::runtime_error("Clone methond is not supported in LXDVMImageVault yet.");
     }

diff --git a/tests/stub_vm_image_vault.h b/tests/stub_vm_image_vault.h
@@ -64,7 +64,7 @@ struct StubVMImageVault final : public multipass::VMImageVault
         return {};
     }
 
-    void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override
+    void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override
     {
     }