Settings handlers

include/multipass/callable_traits.h

@@ -21,19 +21,41 @@
 #define MULTIPASS_CALLABLE_TRAITS_H
 
 #include <tuple>
-#include <type_traits>
 
 namespace multipass
 {
-// For lambdas, look at it's functor operator
+// For lambdas, look at their function operator
+// For functors, look at their function-call operator
 template <typename T>
-struct callable_traits
-    : public callable_traits<decltype(&std::remove_reference<T>::type::operator())>
+struct callable_traits : public callable_traits<decltype(&T::operator())>
 {
 };
 
+// Deal with references and pointers
+template <typename T>
+struct callable_traits<T&> : public callable_traits<T>
+{
+};
+
+template <typename T>
+struct callable_traits<T*> : public callable_traits<T>
+{
+};
+
+// Deal with member functions
 template <typename ClassType, typename ReturnType, typename... Args>
-struct callable_traits<ReturnType (ClassType::*)(Args...) const>
+struct callable_traits<ReturnType (ClassType::*)(Args...) const> : public callable_traits<ReturnType(Args...)>
+{
+};
+
+template <typename ClassType, typename ReturnType, typename... Args>
+struct callable_traits<ReturnType (ClassType::*)(Args...)> : public callable_traits<ReturnType(Args...)>
+{
+};
+
+// Finally, the most basic function type, where all others will drain
+template <typename ReturnType, typename... Args>
+struct callable_traits<ReturnType(Args...)>
 {
     using return_type = ReturnType;
     static constexpr std::size_t num_args = sizeof...(Args);

include/multipass/cli/client_common.h

@@ -55,6 +55,8 @@ std::string update_notice(const multipass::UpdateInfo& update_info);
 
 namespace client
 {
+QString persistent_settings_filename();
+void register_global_settings_handlers();
 std::shared_ptr<grpc::Channel> make_channel(const std::string& server_address, CertProvider* cert_provider);
 std::string get_server_address();
 std::unique_ptr<SSLCertProvider> get_cert_provider();

include/multipass/cli/command.h

@@ -140,8 +140,6 @@ class Command : private DisabledCopyMove
     std::ostream& cerr;
 
 private:
-    virtual ParseCode parse_args(ArgParser* parser) = 0;
-
     template <typename SuccessCallable, typename FailureCallable>
     void check_return_callables(SuccessCallable&& on_success, FailureCallable&& on_failure)
     {

include/multipass/cli/format_utils.h

@@ -20,7 +20,7 @@
 
 #include <multipass/constants.h>
 #include <multipass/rpc/multipass.grpc.pb.h>
-#include <multipass/settings.h>
+#include <multipass/settings/settings.h>
 
 #include <fmt/format.h>
 

include/multipass/constants.h

@@ -45,15 +45,19 @@ constexpr auto driver_env_var = "MULTIPASS_VM_DRIVER";
 constexpr auto winterm_profile_guid =
     "{aaaa9e6d-1e09-4be6-b76c-82b4ba1885fb}"; // identifies the primary Multipass profile in Windows Terminal
 
+constexpr auto settings_extension = ".conf";
+constexpr auto daemon_settings_root = "local";
 constexpr auto petenv_key = "client.primary-name";     // This will eventually be moved to some dynamic settings schema
 constexpr auto driver_key = "local.driver";            // idem
 constexpr auto passphrase_key = "local.passphrase";    // idem
 constexpr auto bridged_interface_key = "local.bridged-network"; // idem
-constexpr auto bridged_network_name = "bridged";
 constexpr auto mounts_key = "local.privileged-mounts"; // idem
 constexpr auto autostart_key = "client.gui.autostart"; // idem
 constexpr auto winterm_key = "client.apps.windows-terminal.profiles"; // idem
 constexpr auto hotkey_key = "client.gui.hotkey";                      // idem
+
+constexpr auto bridged_interface_default = "bridged";
+constexpr auto petenv_default = "primary";
 constexpr auto hotkey_default = "Ctrl+Alt+U";                         // idem; translates to Cmd+Opt+U on macOS
 
 constexpr auto timeout_exit_code = 5;

include/multipass/exceptions/settings_exceptions.h

@@ -30,7 +30,7 @@ namespace multipass
 class SettingsException : public std::runtime_error
 {
 public:
-    SettingsException(const std::string& msg) : runtime_error{msg}
+    explicit SettingsException(const std::string& msg) : runtime_error{msg}
     {
     }
 };
@@ -44,15 +44,19 @@ class PersistentSettingsException : public SettingsException
     }
 };
 
-class InvalidSettingsException : public SettingsException
+class UnrecognizedSettingException : public SettingsException
 {
 public:
-    InvalidSettingsException(const QString& key)
+    explicit UnrecognizedSettingException(const QString& key)
         : SettingsException{fmt::format("Unrecognized settings key: '{}'", key)}
     {
     }
+};
 
-    InvalidSettingsException(const QString& key, const QString& val, const QString& why)
+class InvalidSettingException : public SettingsException
+{
+public:
+    InvalidSettingException(const QString& key, const QString& val, const QString& why)
         : SettingsException{fmt::format("Invalid setting '{}={}': {}", key, val, why)}
     {
     }
@@ -62,7 +66,7 @@ template <typename T>
 class UnsupportedSettingValueType : public SettingsException
 {
 public:
-    UnsupportedSettingValueType(const QString& key)
+    explicit UnsupportedSettingValueType(const QString& key)
         : SettingsException{fmt::format("Invalid value type for key {}. Type hint: {}", key, typeid(T).name())}
     {
     }

include/multipass/platform.h

@@ -24,6 +24,7 @@
 #include <multipass/network_interface_info.h>
 #include <multipass/process/process.h>
 #include <multipass/process/process_spec.h>
+#include <multipass/settings/setting_spec.h>
 #include <multipass/singleton.h>
 #include <multipass/sshfs_server_config.h>
 #include <multipass/update_prompt.h>
@@ -66,21 +67,20 @@ class Platform : public Singleton<Platform>
     virtual void remove_alias_script(const std::string& alias) const;
     virtual std::string alias_path_message() const;
     virtual void set_server_socket_restrictions(const std::string& server_address, const bool restricted) const;
+    virtual QString daemon_config_home() const; // temporary
+    virtual SettingSpec::Set extra_daemon_settings() const;
+    virtual SettingSpec::Set extra_client_settings() const;
+    virtual QString default_driver() const;
+    virtual QString default_privileged_mounts() const;
 };
 
-std::map<QString, QString> extra_settings_defaults();
-
 QString interpret_setting(const QString& key, const QString& val);
 void sync_winterm_profiles();
 
 QString autostart_test_data(); // returns a platform-specific string, for testing purposes
 void setup_gui_autostart_prerequisites();
 
 std::string default_server_address();
-QString default_driver();
-QString default_privileged_mounts();
-
-QString daemon_config_home(); // temporary
 
 VirtualMachineFactory::UPtr vm_backend(const Path& data_dir);
 logging::Logger::UPtr make_logger(logging::Level level);

include/multipass/settings/basic_setting_spec.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021-2022 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MULTIPASS_BASIC_SETTING_SPEC_H
+#define MULTIPASS_BASIC_SETTING_SPEC_H
+
+#include "setting_spec.h"
+
+namespace multipass
+{
+class BasicSettingSpec : public SettingSpec
+{
+public:
+    BasicSettingSpec(QString key, QString default_);
+    QString get_key() const override;
+    QString get_default() const override;
+    QString interpret(QString val) const override;
+
+protected:
+    QString key;
+    QString default_;
+};
+} // namespace multipass
+
+#endif // MULTIPASS_BASIC_SETTING_SPEC_H

include/multipass/settings/bool_setting_spec.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021-2022 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MULTIPASS_BOOL_SETTING_SPEC_H
+#define MULTIPASS_BOOL_SETTING_SPEC_H
+
+#include "basic_setting_spec.h"
+
+#include <utility>
+
+namespace multipass
+{
+class BoolSettingSpec : public BasicSettingSpec
+{
+public:
+    BoolSettingSpec(QString key, QString default_);
+    QString interpret(QString val) const override;
+
+private:
+    BoolSettingSpec(std::pair<QString, QString> params);
+};
+} // namespace multipass
+
+#endif // MULTIPASS_BOOL_SETTING_SPEC_H

include/multipass/settings/dynamic_setting_spec.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021-2022 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MULTIPASS_DYNAMIC_SETTING_SPEC_H
+#define MULTIPASS_DYNAMIC_SETTING_SPEC_H
+
+#include "basic_setting_spec.h"
+
+#include <functional>
+
+namespace multipass
+{
+class DynamicSettingSpec : public multipass::BasicSettingSpec
+{
+public:
+    DynamicSettingSpec(QString key, QString default_, std::function<QString(QString)> interpreter);
+    QString interpret(QString val) const override;
+
+protected:
+    std::function<QString(const QString&)> interpreter;
+};
+} // namespace multipass
+
+#endif // MULTIPASS_DYNAMIC_SETTING_SPEC_H