feat: Add components subcommand

crates/api-client/openapi.json

@@ -3266,9 +3266,9 @@
           },
           "dynamic_fields": {
             "type": "array",
-            "description": "List of dynamic fields",
+            "description": "List of configuration fields",
             "items": {
-              "$ref": "#/components/schemas/DynamicFieldsItem"
+              "$ref": "#/components/schemas/ConfigurationField"
             }
           },
           "changelog": {
@@ -3284,30 +3284,37 @@
           }
         }
       },
-      "DynamicFieldsItem": {
+      "ConfigurationField": {
         "type": "object",
         "properties": {
           "name": {
             "type": "string",
-            "description": "The name of the dynamic field."
+            "description": "The name of the configuration field."
           },
           "title": {
             "type": "string",
-            "description": "The title of the dynamic field."
+            "description": "The title of the configuration field."
           },
           "type": {
             "type": "string",
-            "description": "The type of the dynamic field."
+            "description": "The type of the configuration field.",
+            "enum": ["string", "boolean", "number"]
           },
           "required": {
             "type": "boolean",
-            "description": "Whether the dynamic field is required."
+            "description": "Whether the configuration field is required."
           },
           "description": {
             "type": "string",
-            "description": "The description of the dynamic field."
+            "description": "The description of the configuration field."
           }
-        }
+        },
+        "required": [
+          "name",
+          "title",
+          "type",
+          "required"
+        ]
       },
       "ComponentCreateInput": {
         "type": "object",
@@ -3410,9 +3417,9 @@
           },
           "dynamic_fields": {
             "type": "array",
-            "description": "List of dynamic fields",
+            "description": "List of configuration fields",
             "items": {
-              "$ref": "#/components/schemas/DynamicFieldsItem"
+              "$ref": "#/components/schemas/ConfigurationField"
             }
           },
           "changelog": {

crates/cli/src/commands/components/push.rs

@@ -1,3 +1,6 @@
+use crate::components::manifest::Manifest;
+use edgee_api_client::types as api_types;
+
 #[derive(Debug, clap::Parser)]
 pub struct Options {
     /// Which organization to create the component into if not existing already.
@@ -7,9 +10,9 @@ pub struct Options {
 }
 
 pub async fn run(opts: Options) -> anyhow::Result<()> {
-    use edgee_api_client::{auth::Credentials, types, ResultExt};
+    use edgee_api_client::{auth::Credentials, ResultExt};
 
-    use crate::components::manifest::{self, Manifest};
+    use crate::components::manifest;
 
     let creds = Credentials::load()?;
     creds.check_api_token()?;
@@ -55,16 +58,26 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
             client
                 .create_component()
                 .body(
-                    types::ComponentCreateInput::builder()
+                    api_types::ComponentCreateInput::builder()
                         .organization_id(organization.id.clone())
                         .name(&manifest.package.name)
-                        .description(manifest.package.description)
+                        .description(manifest.package.description.clone())
                         .category(manifest.package.category)
                         .subcategory(manifest.package.subcategory)
                         .documentation_link(
-                            manifest.package.documentation.map(|url| url.to_string()),
+                            manifest
+                                .package
+                                .documentation
+                                .as_ref()
+                                .map(|url| url.to_string()),
                         )
-                        .repo_link(manifest.package.repository.map(|url| url.to_string())),
+                        .repo_link(
+                            manifest
+                                .package
+                                .repository
+                                .as_ref()
+                                .map(|url| url.to_string()),
+                        ),
                 )
                 .send()
                 .await
@@ -85,10 +98,11 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
         .org_slug(organization.slug)
         .component_slug(&manifest.package.name)
         .body(
-            types::ComponentVersionCreateInput::builder()
+            api_types::ComponentVersionCreateInput::builder()
                 .version(&manifest.package.version)
                 .wit_world_version(&manifest.package.wit_world_version)
-                .wasm_url(asset_url),
+                .wasm_url(asset_url)
+                .dynamic_fields(convert_manifest_config_fields(&manifest)),
         )
         .send()
         .await
@@ -102,3 +116,18 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
 
     Ok(())
 }
+
+fn convert_manifest_config_fields(manifest: &Manifest) -> Vec<api_types::ConfigurationField> {
+    manifest
+        .package
+        .config_fields
+        .iter()
+        .map(|(name, field)| api_types::ConfigurationField {
+            name: name.clone(),
+            title: field.title.clone(),
+            type_: field.type_,
+            required: field.required,
+            description: field.description.clone(),
+        })
+        .collect()
+}

crates/cli/src/components/manifest.rs

@@ -1,4 +1,7 @@
-use std::path::{Path, PathBuf};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
 
 use anyhow::{Context, Result};
 use serde::Deserialize;
@@ -15,6 +18,7 @@ pub struct Manifest {
 }
 
 #[derive(Debug, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub struct Package {
     pub name: String,
     pub version: String,
@@ -29,9 +33,11 @@ pub struct Package {
     #[serde(default)]
     pub repository: Option<url::Url>,
 
-    #[serde(rename = "wit-world-version")]
     pub wit_world_version: String,
 
+    #[serde(default)]
+    pub config_fields: HashMap<String, ConfigField>,
+
     pub build: Build,
 }
 
@@ -55,6 +61,27 @@ pub enum SubCategory {
     Attribution,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct ConfigField {
+    pub title: String,
+    #[serde(rename = "type", with = "ConfigFieldType")]
+    pub type_: api_types::ConfigurationFieldType,
+    #[serde(default)]
+    pub required: bool,
+    pub description: Option<String>,
+}
+
+#[derive(Debug, Clone, Copy, Deserialize)]
+#[serde(
+    remote = "api_types::ConfigurationFieldType",
+    rename_all = "kebab-case"
+)]
+pub enum ConfigFieldType {
+    String,
+    Boolean,
+    Number,
+}
+
 #[derive(Debug, Deserialize)]
 pub struct Build {
     pub command: String,