Make it possible to satisfy Vec<PluginDefinition>: PrintRes in extern…

…al crates (#1124) * Make it possible to satisfy Vec<PluginDefinition>: PrintRes in external crates * Clippy
golemcloud · Dec 4, 2024 · 72344e8 · 72344e8
1 parent 42d5d3c
commit 72344e8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/golem-cli/src/command/plugin.rs b/golem-cli/src/command/plugin.rs
@@ -107,10 +107,10 @@ impl<PluginScopeRef: clap::Args> PluginSubcommand<PluginScopeRef> {
         components: Arc<dyn ComponentService<ProjectContext = ProjectContext> + Send + Sync>,
     ) -> Result<GolemResult, GolemError>
     where
-        Vec<PluginDefinition>: PrintRes,
         PluginScopeRef: PluginScopeArgs<PluginScope = PluginScope>,
         <PluginScopeRef as PluginScopeArgs>::ComponentRef:
             ComponentRefSplit<ProjectRef> + Send + Sync,
+        Vec<PluginDefinition>: PrintRes,
     {
         match self {
             PluginSubcommand::List { scope } => {

diff --git a/golem-cli/src/model/text.rs b/golem-cli/src/model/text.rs
@@ -24,6 +24,18 @@ pub mod fmt {
         fn print(&self);
     }
 
+    pub trait TableWrapper: Sized {
+        type Table: TextFormat;
+        fn from_vec(vec: &[Self]) -> Self::Table;
+    }
+
+    impl<T: TableWrapper> TextFormat for Vec<T> {
+        fn print(&self) {
+            let table = T::from_vec(self);
+            table.print();
+        }
+    }
+
     pub trait MessageWithFields {
         fn message(&self) -> String;
         fn fields(&self) -> Vec<(String, String)>;
@@ -1330,7 +1342,7 @@ pub mod worker {
 pub mod plugin {
     use crate::model::text::fmt::{
         format_id, format_main_id, format_message_highlight, FieldsBuilder, MessageWithFields,
-        TextFormat,
+        TableWrapper, TextFormat,
     };
     use cli_table::{print_stdout, Table, WithTitle};
     use golem_client::model::{
@@ -1380,10 +1392,21 @@ pub mod plugin {
         }
     }
 
-    impl TextFormat for Vec<PluginDefinitionDefaultPluginOwnerDefaultPluginScope> {
+    pub struct PluginDefinitionTable(Vec<PluginDefinitionDefaultPluginOwnerDefaultPluginScope>);
+
+    impl TableWrapper for PluginDefinitionDefaultPluginOwnerDefaultPluginScope {
+        type Table = PluginDefinitionTable;
+
+        fn from_vec(vec: &[Self]) -> Self::Table {
+            PluginDefinitionTable(vec.to_vec())
+        }
+    }
+
+    impl TextFormat for PluginDefinitionTable {
         fn print(&self) {
             print_stdout(
-                self.iter()
+                self.0
+                    .iter()
                     .map(PluginDefinitionTableView::from)
                     .collect::<Vec<_>>()
                     .with_title(),