CLI quick fixes (#2540)

* copy JSON schema 1.4.0 as 1.4.2

* schema fixes + optionally include json schema validation errors as hints during app manifest load

* fix static token loading

* validation fix for mixed profile / env mode

* more help

* make fix

* fix component selection flag to be dir based for help messages

* switch dir selection logic to currentdir for build and clean, and drop redundant component subcommands

* fix rollback diff crash

Author: noise64

Cargo.lock

@@ -186,6 +186,7 @@ inquire = "0.7.5"
 iso8601 = "0.6.2"
 iso8601-timestamp = "0.3.3"
 itertools = "0.14.0"
+jsonschema = "0.38.1"
 jsonwebtoken = "9.2.0"
 k8s-openapi = { version = "0.24.0", features = ["earliest"] }
 kill_tree = "0.2.4"

Cargo.toml

@@ -70,6 +70,7 @@ indoc = { workspace = true }
 inquire = { workspace = true }
 iso8601 = { workspace = true }
 itertools = { workspace = true }
+jsonschema = { workspace = true }
 lenient_bool = { workspace = true }
 minijinja = { workspace = true }
 moonbit-component-generator = { workspace = true }

cli/golem-cli/Cargo.toml

@@ -106,18 +106,15 @@ pub struct GolemCliGlobalFlags {
     pub format: Option<Format>,
 
     /// Select Golem environment by name
-    #[arg(long, short = 'E', global = true, conflicts_with_all = ["local", "cloud"], display_order = 102
-    )]
+    #[arg(long, short = 'E', global = true, display_order = 102)]
     pub environment: Option<EnvironmentReference>,
 
-    /// Select" local" environment from the manifest, or "local" profile
-    #[arg(long, short = 'L', global = true, conflicts_with_all = ["environment", "cloud"], display_order = 103
-    )]
+    /// Select "local" environment from the manifest, or "local" profile
+    #[arg(long, short = 'L', global = true, conflicts_with_all = ["cloud"], display_order = 103)]
     pub local: bool,
 
     /// Select "cloud" environment from the manifest, or "cloud" profile
-    #[arg(long, short = 'C', global = true, conflicts_with_all = ["environment", "local"], display_order = 104
-    )]
+    #[arg(long, short = 'C', global = true, conflicts_with_all = ["local"], display_order = 104)]
     pub cloud: bool,
 
     /// Custom path to the root application manifest (golem.yaml)
@@ -915,8 +912,7 @@ pub mod environment {
 
 pub mod component {
     use crate::command::shared_args::{
-        BuildArgs, ComponentOptionalComponentName, ComponentOptionalComponentNames,
-        ComponentTemplateName,
+        ComponentOptionalComponentName, ComponentOptionalComponentNames, ComponentTemplateName,
     };
     use crate::model::worker::AgentUpdateMode;
     use clap::Subcommand;
@@ -936,18 +932,6 @@ pub mod component {
             /// Optional filter for language or template name
             filter: Option<String>,
         },
-        /// Build component(s) based on the current directory or by selection
-        Build {
-            #[command(flatten)]
-            component_name: ComponentOptionalComponentNames,
-            #[command(flatten)]
-            build: BuildArgs,
-        },
-        /// Clean component(s) based on the current directory or by selection
-        Clean {
-            #[command(flatten)]
-            component_name: ComponentOptionalComponentNames,
-        },
         /// List deployed component versions' metadata
         List,
         /// Get the latest or selected revision of deployed component metadata

cli/golem-cli/src/command.rs

@@ -827,7 +827,7 @@ impl<'a, Name, Entity> RollbackEntityDetails<Name, &'a Entity> {
     ) -> Self {
         match entity_diff {
             diff::BTreeMapDiffValue::Create => Self {
-                new: Some(get_current(rollback_diff, &name)),
+                new: Some(get_new(rollback_diff, &name)),
                 current: None,
                 name,
             },

cli/golem-cli/src/command_handler/app/deploy_diff.rs

@@ -266,15 +266,15 @@ impl AppCommandHandler {
         self.build(
             component_name.component_name,
             Some(build_args),
-            &ApplicationComponentSelectMode::All,
+            &ApplicationComponentSelectMode::CurrentDir,
         )
         .await
     }
 
     pub async fn cmd_clean(&self, component_name: AppOptionalComponentNames) -> anyhow::Result<()> {
         self.clean(
             component_name.component_name,
-            &ApplicationComponentSelectMode::All,
+            &ApplicationComponentSelectMode::CurrentDir,
         )
         .await
     }

cli/golem-cli/src/command_handler/app/mod.rs

@@ -16,7 +16,7 @@ use crate::app::context::{to_anyhow, ApplicationContext};
 
 use crate::command::component::ComponentSubcommand;
 use crate::command::shared_args::{
-    BuildArgs, ComponentOptionalComponentNames, ComponentTemplateName, DeployArgs,
+    ComponentOptionalComponentNames, ComponentTemplateName, DeployArgs,
 };
 use crate::command_handler::component::ifs::IfsFileManager;
 use crate::command_handler::component::staging::ComponentStager;
@@ -89,11 +89,6 @@ impl ComponentCommandHandler {
                 self.cmd_templates(filter);
                 Ok(())
             }
-            ComponentSubcommand::Build {
-                component_name,
-                build: build_args,
-            } => self.cmd_build(component_name, build_args).await,
-            ComponentSubcommand::Clean { component_name } => self.cmd_clean(component_name).await,
             ComponentSubcommand::List => self.cmd_list().await,
             ComponentSubcommand::Get {
                 component_name,
@@ -209,34 +204,6 @@ impl ComponentCommandHandler {
         Ok(())
     }
 
-    async fn cmd_build(
-        &self,
-        component_name: ComponentOptionalComponentNames,
-        build_args: BuildArgs,
-    ) -> anyhow::Result<()> {
-        self.ctx
-            .app_handler()
-            .build(
-                component_name.component_name,
-                Some(build_args),
-                &ApplicationComponentSelectMode::CurrentDir,
-            )
-            .await
-    }
-
-    async fn cmd_clean(
-        &self,
-        component_name: ComponentOptionalComponentNames,
-    ) -> anyhow::Result<()> {
-        self.ctx
-            .app_handler()
-            .clean(
-                component_name.component_name,
-                &ApplicationComponentSelectMode::CurrentDir,
-            )
-            .await
-    }
-
     fn cmd_templates(&self, filter: Option<String>) {
         match filter {
             Some(filter) => {