Merge branch 'master' into fix-examples

Cargo.toml

@@ -17,7 +17,7 @@ clap = { version = "4.4.1", features = ["derive"] }
 clap-verbosity-flag = "2.0.1"
 derive_more = "0.99.17"
 futures-util = "0.3.28"
-golem-client = "0.0.32"
+golem-client = "0.0.40"
 golem-examples = "0.1.5"
 http = "0.2.9"
 indoc = "2.0.3"

src/examples.rs

@@ -1,8 +1,7 @@
-use crate::model::GolemError;
+use crate::model::{ExampleDescription, GolemError};
 use crate::GolemResult;
 use golem_examples::model::{
-    Example, ExampleName, ExampleParameters, GuestLanguage, GuestLanguageTier, PackageName,
-    TemplateName,
+    ExampleName, ExampleParameters, GuestLanguage, GuestLanguageTier, PackageName, TemplateName,
 };
 use golem_examples::*;
 use std::env;
@@ -50,8 +49,8 @@ pub fn process_list_examples(
             Some(min_tier) => example.language.tier() <= *min_tier,
             None => true,
         })
-        .cloned()
-        .collect::<Vec<Example>>();
+        .map(ExampleDescription::from_example)
+        .collect::<Vec<ExampleDescription>>();
 
     Ok(GolemResult::Ok(Box::new(examples)))
 }

src/model.rs

@@ -14,6 +14,7 @@ use golem_client::project::ProjectError;
 use golem_client::project_grant::ProjectGrantError;
 use golem_client::project_policy::ProjectPolicyError;
 use golem_client::token::TokenError;
+use golem_examples::model::{Example, ExampleName, GuestLanguage, GuestLanguageTier};
 use indoc::indoc;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
@@ -702,3 +703,22 @@ impl TypedValueParser for JsonValueParser {
         }
     }
 }
+
+#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
+pub struct ExampleDescription {
+    pub name: ExampleName,
+    pub language: GuestLanguage,
+    pub description: String,
+    pub tier: GuestLanguageTier,
+}
+
+impl ExampleDescription {
+    pub fn from_example(example: &Example) -> Self {
+        Self {
+            name: example.name.clone(),
+            language: example.language.clone(),
+            description: example.description.clone(),
+            tier: example.language.tier(),
+        }
+    }
+}