chore: do not force include XXXOption if not use

Signed-off-by: black-desk <me@black-desk.cn>
black-desk · Jan 16, 2024 · beeaddf · beeaddf
1 parent 85fa1a5
commit beeaddf
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 35 deletions.
diff --git a/examples/using-crun/src/main.cpp b/examples/using-crun/src/main.cpp
@@ -5,7 +5,6 @@
 #include <exception>   // for exception_ptr, exception
 #include <filesystem>  // for path
 #include <iostream>    // for basic_ostream, operator<<
-#include <list>        // for list, operator!=, _List...
 #include <map>         // for operator!=, operator==
 #include <memory>      // for shared_ptr, make_shared
 #include <string>      // for char_traits, basic_string
@@ -20,7 +19,6 @@
 #include "ocppi/cli/CLI.hpp"                        // for CLI
 #include "ocppi/cli/crun/Crun.hpp"                  // for Crun
 #include "ocppi/runtime/ContainerID.hpp"            // for ContainerID
-#include "ocppi/runtime/ListOption.hpp"             // IWYU pragma: keep
 #include "ocppi/runtime/Signal.hpp"                 // for Signal
 #include "ocppi/runtime/state/types/Generators.hpp" // IWYU pragma: keep
 #include "ocppi/types/ContainerListItem.hpp"        // for ContainerListItem

diff --git a/include/ocppi/cli/crun/Crun.hpp b/include/ocppi/cli/crun/Crun.hpp
@@ -2,7 +2,6 @@
 
 #include <exception>  // for exception_ptr
 #include <filesystem> // for path
-#include <list>       // for list
 #include <memory>     // for make_shared, shared_ptr
 #include <string>     // for string
 #include <vector>     // for vector
@@ -54,44 +53,67 @@ class Crun final : public CLI {
                 -> tl::expected<std::unique_ptr<Crun>, std::exception_ptr>;
 
         [[nodiscard]]
-        auto
-        state(const runtime::ContainerID &id,
-              const std::vector<runtime::StateOption> &opts = {}) const noexcept
+        auto state(const runtime::ContainerID &id) const noexcept
+                -> tl::expected<runtime::state::types::State,
+                                std::exception_ptr> override;
+        [[nodiscard]]
+        auto state(const runtime::ContainerID &id,
+                   const std::vector<runtime::StateOption> &opts) const noexcept
                 -> tl::expected<runtime::state::types::State,
                                 std::exception_ptr> override;
 
         [[nodiscard]]
-        auto
-        create(const runtime::ContainerID &id,
-               const std::filesystem::path &pathToBundle,
-               const std::vector<runtime::CreateOption> &opts = {}) noexcept
+        auto create(const runtime::ContainerID &id,
+                    const std::filesystem::path &pathToBundle) noexcept
+                -> tl::expected<void, std::exception_ptr> override;
+        [[nodiscard]]
+        auto create(const runtime::ContainerID &id,
+                    const std::filesystem::path &pathToBundle,
+                    const std::vector<runtime::CreateOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> override;
 
         [[nodiscard]]
+        auto start(const runtime::ContainerID &id) noexcept
+                -> tl::expected<void, std::exception_ptr> override;
+        [[nodiscard]]
         auto start(const runtime::ContainerID &id,
-                   const std::vector<runtime::StartOption> &opts = {}) noexcept
+                   const std::vector<runtime::StartOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> override;
 
         [[nodiscard]]
+        auto kill(const runtime::ContainerID &id,
+                  const runtime::Signal &signal) noexcept
+                -> tl::expected<void, std::exception_ptr> override;
+        [[nodiscard]]
         auto kill(const runtime::ContainerID &id, const runtime::Signal &signal,
-                  const std::vector<runtime::KillOption> &opts = {}) noexcept
+                  const std::vector<runtime::KillOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> override;
 
         [[nodiscard]]
-        auto
-        delete_(const runtime::ContainerID &id,
-                const std::vector<runtime::DeleteOption> &opts = {}) noexcept
+        auto delete_(const runtime::ContainerID &id) noexcept
+                -> tl::expected<void, std::exception_ptr> override;
+        [[nodiscard]]
+        auto delete_(const runtime::ContainerID &id,
+                     const std::vector<runtime::DeleteOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> override;
 
         [[nodiscard]]
+        auto exec(const runtime::ContainerID &id, const std::string &executable,
+                  const std::vector<std::string> &command) noexcept
+                -> tl::expected<void, std::exception_ptr> override;
+        [[nodiscard]]
         auto exec(const runtime::ContainerID &id, const std::string &executable,
                   const std::vector<std::string> &command,
-                  const std::vector<runtime::ExecOption> &opts = {}) noexcept
+                  const std::vector<runtime::ExecOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> override;
 
         [[nodiscard]]
-        auto list(const std::vector<runtime::ListOption> &opts = {}) noexcept
-                -> tl::expected<std::list<types::ContainerListItem>,
+        auto list() noexcept
+                -> tl::expected<std::vector<types::ContainerListItem>,
+                                std::exception_ptr> override;
+        [[nodiscard]]
+        auto list(const std::vector<runtime::ListOption> &opts) noexcept
+                -> tl::expected<std::vector<types::ContainerListItem>,
                                 std::exception_ptr> override;
 };
 }
diff --git a/include/ocppi/runtime/Runtime.hpp b/include/ocppi/runtime/Runtime.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <exception> // for exception_ptr
-#include <list>      // for list
 #include <string>    // for string
 #include <vector>    // for vector
 
@@ -25,13 +24,22 @@ namespace ocppi::runtime
 class Runtime : public SpecRuntime {
     public:
         [[nodiscard]]
+        virtual auto exec(const ContainerID &id, const std::string &executable,
+                          const std::vector<std::string> &command) noexcept
+                -> tl::expected<void, std::exception_ptr> = 0;
+        [[nodiscard]]
         virtual auto exec(const ContainerID &id, const std::string &executable,
                           const std::vector<std::string> &command,
-                          const std::vector<ExecOption> &opts = {}) noexcept
+                          const std::vector<ExecOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> = 0;
+
+        [[nodiscard]]
+        virtual auto list() noexcept
+                -> tl::expected<std::vector<types::ContainerListItem>,
+                                std::exception_ptr> = 0;
         [[nodiscard]]
-        virtual auto list(const std::vector<ListOption> &opts = {}) noexcept
-                -> tl::expected<std::list<types::ContainerListItem>,
+        virtual auto list(const std::vector<ListOption> &opts) noexcept
+                -> tl::expected<std::vector<types::ContainerListItem>,
                                 std::exception_ptr> = 0;
 };
 

diff --git a/include/ocppi/runtime/SpecRuntime.hpp b/include/ocppi/runtime/SpecRuntime.hpp
@@ -33,31 +33,45 @@ class SpecRuntime {
         auto operator=(SpecRuntime &&) -> SpecRuntime & = delete;
 
         [[nodiscard]]
-        virtual auto
-        state(const ContainerID &id,
-              const std::vector<StateOption> &opts = {}) const noexcept
+        virtual auto state(const ContainerID &id) const noexcept
+                -> tl::expected<state::types::State, std::exception_ptr> = 0;
+        [[nodiscard]]
+        virtual auto state(const ContainerID &id,
+                           const std::vector<StateOption> &opts) const noexcept
                 -> tl::expected<state::types::State, std::exception_ptr> = 0;
 
         [[nodiscard]]
+        virtual auto create(const ContainerID &id,
+                            const std::filesystem::path &pathToBundle) noexcept
+                -> tl::expected<void, std::exception_ptr> = 0;
+        [[nodiscard]]
         virtual auto create(const ContainerID &id,
                             const std::filesystem::path &pathToBundle,
-                            const std::vector<CreateOption> &opts = {}) noexcept
+                            const std::vector<CreateOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> = 0;
 
         [[nodiscard]]
+        virtual auto start(const ContainerID &id) noexcept
+                -> tl::expected<void, std::exception_ptr> = 0;
+        [[nodiscard]]
         virtual auto start(const ContainerID &id,
-                           const std::vector<StartOption> &opts = {}) noexcept
+                           const std::vector<StartOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> = 0;
 
         [[nodiscard]]
+        virtual auto kill(const ContainerID &id, const Signal &signal) noexcept
+                -> tl::expected<void, std::exception_ptr> = 0;
+        [[nodiscard]]
         virtual auto kill(const ContainerID &id, const Signal &signal,
-                          const std::vector<KillOption> &opts = {}) noexcept
+                          const std::vector<KillOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> = 0;
 
         [[nodiscard]]
-        virtual auto
-        delete_(const ContainerID &id,
-                const std::vector<DeleteOption> &opts = {}) noexcept
+        virtual auto delete_(const ContainerID &id) noexcept
+                -> tl::expected<void, std::exception_ptr> = 0;
+        [[nodiscard]]
+        virtual auto delete_(const ContainerID &id,
+                             const std::vector<DeleteOption> &opts) noexcept
                 -> tl::expected<void, std::exception_ptr> = 0;
 };
 

diff --git a/src/ocppi/cli/crun/Crun.cpp b/src/ocppi/cli/crun/Crun.cpp
@@ -80,6 +80,12 @@ auto doState(const std::string &bin,
 
 }
 
+auto Crun::state(const runtime::ContainerID &id) const noexcept
+        -> tl::expected<runtime::state::types::State, std::exception_ptr>
+{
+        return this->state(id, {});
+}
+
 auto Crun::state(const runtime::ContainerID &id,
                  const std::vector<runtime::StateOption> &opts) const noexcept
         -> tl::expected<runtime::state::types::State, std::exception_ptr>
@@ -121,6 +127,13 @@ void doCreate(const std::string &bin,
 
 }
 
+auto Crun::create(const runtime::ContainerID &id,
+                  const std::filesystem::path &pathToBundle) noexcept
+        -> tl::expected<void, std::exception_ptr>
+{
+        return this->create(id, pathToBundle, {});
+}
+
 auto Crun::create(const runtime::ContainerID &id,
                   const std::filesystem::path &pathToBundle,
                   const std::vector<runtime::CreateOption> &opts) noexcept
@@ -160,6 +173,12 @@ void doStart(const std::string &bin,
 
 }
 
+auto Crun::start(const runtime::ContainerID &id) noexcept
+        -> tl::expected<void, std::exception_ptr>
+{
+        return this->start(id, {});
+}
+
 auto Crun::start(const runtime::ContainerID &id,
                  const std::vector<runtime::StartOption> &opts) noexcept
         -> tl::expected<void, std::exception_ptr>
@@ -199,6 +218,13 @@ void doKill(const std::string &bin,
 
 }
 
+auto Crun::kill(const runtime::ContainerID &id,
+                const runtime::Signal &signal) noexcept
+        -> tl::expected<void, std::exception_ptr>
+{
+        return this->kill(id, signal, {});
+}
+
 auto Crun::kill(const runtime::ContainerID &id, const runtime::Signal &signal,
                 const std::vector<runtime::KillOption> &opts) noexcept
         -> tl::expected<void, std::exception_ptr>
@@ -237,6 +263,12 @@ void doDelete(const std::string &bin,
 
 }
 
+auto Crun::delete_(const runtime::ContainerID &id) noexcept
+        -> tl::expected<void, std::exception_ptr>
+{
+        return this->delete_(id, {});
+}
+
 auto Crun::delete_(const runtime::ContainerID &id,
                    const std::vector<runtime::DeleteOption> &opts) noexcept
         -> tl::expected<void, std::exception_ptr>
@@ -277,6 +309,13 @@ void doExec(const std::string &bin,
 
 }
 
+auto Crun::exec(const runtime::ContainerID &id, const std::string &executable,
+                const std::vector<std::string> &command) noexcept
+        -> tl::expected<void, std::exception_ptr>
+{
+        return this->exec(id, executable, command, {});
+}
+
 auto Crun::exec(const runtime::ContainerID &id, const std::string &executable,
                 const std::vector<std::string> &command,
                 const std::vector<runtime::ExecOption> &opts) noexcept
@@ -291,7 +330,7 @@ try {
 namespace
 {
 
-tl::expected<std::list<types::ContainerListItem>, std::exception_ptr>
+tl::expected<std::vector<types::ContainerListItem>, std::exception_ptr>
 doList(const std::string &bin,
        [[maybe_unused]] const std::shared_ptr<spdlog::logger> &logger,
        const std::vector<runtime::ListOption> &opts)
@@ -315,13 +354,21 @@ doList(const std::string &bin,
         }
 
         auto j = nlohmann::json::parse(out_ips);
-        return j.get<std::list<types::ContainerListItem>>();
+        return j.get<std::vector<types::ContainerListItem>>();
 }
 
 }
 
+auto Crun::list() noexcept
+        -> tl::expected<std::vector<types::ContainerListItem>,
+                        std::exception_ptr>
+{
+        return this->list({});
+}
+
 auto Crun::list(const std::vector<runtime::ListOption> &opts) noexcept
-        -> tl::expected<std::list<types::ContainerListItem>, std::exception_ptr>
+        -> tl::expected<std::vector<types::ContainerListItem>,
+                        std::exception_ptr>
 try {
         return doList(this->bin(), this->logger(), opts);
 } catch (...) {

diff --git a/tools/iwyu.sh b/tools/iwyu.sh
@@ -54,5 +54,5 @@ CLANG_FORMAT=${CLANG_FORMAT:=$({
 	echo "clang-format"
 })}
 
-find . -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\)' \
+find . -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\)' -not -path "./tools/*" \
 	-exec "$CLANG_FORMAT" -style=file -i {} \;