Fix repository listing and selection (#71)

* inifile: add functions to list sections

This way, we can easily discover all repos in the machine

* repos: refactor it so we can enable/disable repos...

from outside, from an interface or answerfile

Also add some tests to see if we parsed the data correctly

* repos: add view to select repos

* repos: fix security issue

* repos: allow the user to set repos on interactive install

* repos: fix temporary directory name generation

* Disable bogus sonarcloud notification

It complains about a pseudo-RNG in a function that is rarely used, and
used only for testing, almost never in production

* Solve Sonarcloud duplicated code warning

* repos: use the correct version enum

> @viniciusferrao: There's a class that defines version:
>  ```cpp
>  enum class Platform { el8, el9 };
>  ```

* Implement corrections suggested by @viniciusferrao

* Correct issues on RepoManager class

* Fix broken lines.

Signed-off-by: Vinícius Ferrão <[email protected]>

---------

Signed-off-by: Vinícius Ferrão <[email protected]>
Co-authored-by: Vinícius Ferrão <[email protected]>

Author: arthurmco

include/cloysterhpc/cloyster.h

@@ -12,16 +12,16 @@
 #include <string>
 
 namespace cloyster {
-bool showVersion = false;
-bool runAsRoot = false;
-bool dryRun = false;
-bool enableTUI = false;
-bool enableCLI = false;
-bool runAsDaemon = false;
-std::string logLevelInput
-    = fmt::format("{}", magic_enum::enum_name(Log::Level::Info));
-std::string answerfile;
-std::string customRepofilePath;
+extern bool showVersion;
+extern bool runAsRoot;
+extern bool dryRun;
+extern bool enableTUI;
+extern bool enableCLI;
+extern bool runAsDaemon;
+
+extern std::string logLevelInput;
+extern std::string answerfile;
+extern std::string customRepofilePath;
 }
 
 #endif // CLOYSTERHPC_CLOYSTER_H_

include/cloysterhpc/cluster.h

@@ -20,6 +20,7 @@
 #include <cloysterhpc/ofed.h>
 #include <cloysterhpc/queuesystem/pbs.h>
 #include <cloysterhpc/queuesystem/slurm.h>
+#include <cloysterhpc/repos.h>
 #include <cloysterhpc/services/locale.h>
 #include <cloysterhpc/services/timezone.h>
 
@@ -55,6 +56,7 @@ class Cluster {
     std::optional<std::unique_ptr<QueueSystem>> m_queueSystem {};
     std::optional<Postfix> m_mailSystem {};
     std::vector<Node> m_nodes;
+    std::unique_ptr<BaseRunner> m_runner;
 
     bool m_firewall { false };
     SELinuxMode m_selinux { SELinuxMode::Disabled };
@@ -67,7 +69,11 @@ class Cluster {
     bool m_updateSystem { false };
     DiskImage m_diskImage;
 
+    std::optional<RepoManager> m_repos = std::nullopt;
+
 public:
+    Cluster();
+
     [[nodiscard]] Headnode& getHeadnode();
     [[nodiscard]] const Headnode& getHeadnode() const;
 
@@ -91,6 +97,9 @@ class Cluster {
     std::list<std::unique_ptr<Network>>& getNetworks();
     Network& getNetwork(Network::Profile profile);
 
+    void initRepoManager();
+    RepoManager& getRepoManager();
+
     /**
      * @brief Add a new network to the cluster.
      *
@@ -234,9 +243,9 @@ class Cluster {
 #endif
 
     /* TODO: Refactor all those leftovers from legacy C version */
-    std::size_t nodeQuantity;
+    std::size_t nodeQuantity = 0;
     std::string nodePrefix;
-    std::size_t nodePadding;
+    std::size_t nodePadding = 0;
     address nodeStartIP;
     std::string nodeRootPassword;
 };

include/cloysterhpc/const.h

@@ -30,6 +30,8 @@ constexpr const char* installPath = INSTALL_PATH;
 
 } // namespace cloyster
 
+#define OK 0
+
 using cloyster::installPath;
 using cloyster::productName;
 using cloyster::productUrl;

include/cloysterhpc/inifile.h

@@ -8,6 +8,7 @@
 
 #include <SimpleIni.h>
 #include <filesystem>
+#include <vector>
 
 /**
  * @class inifile
@@ -56,6 +57,20 @@ class inifile {
     std::string getValue(const std::string& section, const std::string& key,
         const bool optional = true, const bool canBeNull = true);
 
+    /**
+     * @brief List all the sections in a file
+     *
+     * @return The names of the sections found
+     */
+    std::vector<std::string> listAllSections() const;
+
+    /**
+     * @brief List all the entries of a section
+     *
+     * @return The names of the entries found
+     */
+    std::vector<std::string> listAllEntries(const std::string& section) const;
+
     /**
      * @brief Sets a value in the INI file.
      *

include/cloysterhpc/presenter/PresenterRepository.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 Vinícius Ferrão <[email protected]>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <cloysterhpc/presenter/Presenter.h>
+
+class PresenterRepository : public Presenter {
+private:
+    struct Messages {
+        static constexpr const auto title = "Repository Selection";
+
+        struct General {
+            static constexpr const auto question
+                = "Enable/disable the repositories you want to install. Use "
+                  "SPACE for selecting/deselecting";
+            static constexpr const auto help
+                = Presenter::Messages::Placeholder::help;
+        };
+    };
+
+public:
+    PresenterRepository(
+        std::unique_ptr<Cluster>& model, std::unique_ptr<Newt>& view);
+};

include/cloysterhpc/repos.h

@@ -6,38 +6,30 @@
 #ifndef CLOYSTERHPC_REPOS_H_
 #define CLOYSTERHPC_REPOS_H_
 
-#include "inifile.h"
+#include <cloysterhpc/inifile.h>
 #include <cloysterhpc/os.h>
+#include <cloysterhpc/runner.h>
+
+#include <filesystem>
+#include <ranges>
 #include <string>
 
 namespace cloyster {
 extern std::string customRepofilePath;
 };
 
-struct repofile {
+struct repository {
     std::string id;
     bool enabled = true;
     std::string name;
     std::string baseurl;
     std::string metalink;
     bool gpgcheck = true;
     std::string gpgkey;
-    std::string gpgkeyContent;
-
-    repofile(const std::string& id, const std::string& name,
-        const std::string& baseurl, const std::string& metalink,
-        const std::string& gpgkey, const std::string& gpgkeyContent)
-        : id(id)
-        , name(name)
-        , baseurl(baseurl)
-        , metalink(metalink)
-        , gpgkey(gpgkey)
-        , gpgkeyContent(gpgkeyContent)
-    {
-    }
+    std::filesystem::path source;
 };
 
-class Repos {
+class RepoManager {
 public:
     enum class AdditionalType {
         beegfs,
@@ -51,35 +43,43 @@ class Repos {
         RPMFusionUpdates
     };
 
+    RepoManager(BaseRunner& runner, const OS& osinfo)
+        : m_runner(runner)
+        , m_os(osinfo)
+    {
+    }
+
+    void loadFiles(const std::filesystem::path& basedir = "/etc/yum.repos.d");
+    void loadCustom(inifile& file, const std::filesystem::path& path);
+
+    void enable(const std::string& id);
+    void enableMultiple(std::vector<std::string> ids);
+    void disable(const std::string& id);
+
+    void commitStatus();
+
+    const std::vector<repository>& listRepos() const;
+
+    std::vector<std::string> getxCATOSImageRepos() const;
+
 private:
-    void configureEL() const;
-    void configureEL8() const;
-    void configureEL9() const;
-    void configureXCAT() const;
-    void configureAdditionalRepos(
-        const std::vector<AdditionalType>& additional) const;
-    void createGPGKeyFile(
-        const std::string& filename, const std::string& key) const;
-    void createGPGKeyFile(
-        const std::filesystem::path& path, const std::string& key) const;
-    void createGPGKeyFile(const repofile& repo) const;
-    void createCloysterRepo() const;
+    std::vector<repository> m_repos;
+    BaseRunner& m_runner;
     OS m_os;
 
-    inifile CLOYSTER_REPO_EL8 {
-#include "cloysterhpc/repos/el8/cloyster.repo"
-    };
-    inifile CLOYSTER_REPO_EL9 = {
-#include "cloysterhpc/repos/el9/cloyster.repo"
-    };
+    void createFileFor(std::filesystem::path path);
 
-public:
-    explicit Repos(const OS& osinfo);
-    void createConfigurationFile(const repofile& repo) const;
-    static void enable(const std::string& id);
-    static void disable(const std::string& id);
-    void configureRepositories() const;
-    [[nodiscard]] std::vector<std::string> getxCATOSImageRepos() const;
+    std::vector<repository> buildCloysterTree(
+        const std::filesystem::path& basedir);
+
+    void loadSingleFile(std::filesystem::path source);
+    void saveRepositories();
+
+    void configureXCAT();
+    void configureEL();
+    void setEnableState(const std::string& id, bool value);
+
+    void mergeWithCurrentList(std::vector<repository>&& repo);
 };
 
-#endif // CLOYSTERHPC_REPOS_H_
+#endif // CLOYSTERHPC_REPOS_H_