refactor: dissolve hm-plugin-cloud into hm/src/commands/cloud (#180)

Author: markovejnovic

Cargo.lock

@@ -6,7 +6,6 @@ members = [
     "crates/hm-core",
     "crates/hm-plugin-protocol",
     "crates/hm-pipeline-ir",
-    "crates/hm-plugin-cloud",
     "crates/hm-dsl-engine",
     "crates/hm-render",
     "crates/hm-vm",
@@ -17,7 +16,6 @@ default-members = [
     "crates/hm-core",
     "crates/hm-plugin-protocol",
     "crates/hm-pipeline-ir",
-    "crates/hm-plugin-cloud",
     "crates/hm-dsl-engine",
     "crates/hm-render",
     "crates/hm-vm",
@@ -31,7 +29,6 @@ repository = "https://github.com/harmont-dev/harmont-cli"
 [workspace.dependencies]
 hm-core            = { path = "crates/hm-core",           version = "0.0.0-dev" }
 hm-plugin-protocol = { path = "crates/hm-plugin-protocol", version = "0.0.0-dev" }
-hm-plugin-cloud    = { path = "crates/hm-plugin-cloud",    version = "0.0.0-dev" }
 hm-pipeline-ir     = { path = "crates/hm-pipeline-ir",     version = "0.0.0-dev" }
 hm-dsl-engine      = { path = "crates/hm-dsl-engine",     version = "0.0.0-dev" }
 hm-render          = { path = "crates/hm-render",          version = "0.0.0-dev" }

Cargo.toml

@@ -1,5 +1,5 @@
 //! Cloud execution backend (submit + watch over the SDK).
-pub mod watch; // pub: hm-plugin-cloud's `build watch`/`job log` verbs reuse it
+pub mod watch; // pub: the CLI's `cloud build watch`/`cloud job log` verbs reuse it
 
 mod backend;
 pub use backend::CloudBackend;

crates/hm-core/src/exec/cloud/mod.rs

@@ -1,4 +1,4 @@
-//! Build-event renderers shared by the `hm` CLI and `hm-plugin-cloud`.
+//! Build-event renderers shared across the `hm` CLI's local and cloud paths.
 //!
 //! This crate owns the output layer: the [`OutputRenderer`] trait, the
 //! [`OutputMode`] selection enum, and the concrete renderers
@@ -15,7 +15,7 @@ use hm_plugin_protocol::BuildEvent;
 /// the `NO_COLOR` env convention, and whether stderr is a TTY.
 ///
 /// Single source of truth for the color rule, shared by the `hm` run
-/// context and `hm-plugin-cloud`'s render preferences.
+/// context and the cloud commands' render preferences.
 #[must_use]
 pub fn color_enabled(no_color_flag: bool) -> bool {
     !no_color_flag && std::env::var_os("NO_COLOR").is_none() && std::io::stderr().is_terminal()

crates/hm-plugin-cloud/Cargo.toml

@@ -62,8 +62,8 @@ hm-pipeline-ir     = { workspace = true }
 hm-plugin-protocol = { workspace = true }
 hm-common = { workspace = true }
 hm-core = { workspace = true }
-hm-plugin-cloud = { workspace = true }
-harmont-cloud   = { workspace = true }
+harmont-cloud     = { workspace = true }
+harmont-cloud-raw = { workspace = true }
 hm-vm           = { workspace = true, features = ["docker-backend"] }
 hm-dsl-engine   = { workspace = true }
 hm-render       = { workspace = true }

crates/hm-render/src/lib.rs

@@ -133,8 +133,7 @@ hm run --help                          # full flag reference
 ## Cloud
 
 `hm cloud <verb>` talks to the hosted Harmont API at `api.harmont.dev`.
-Every cloud verb is delivered by the embedded `hm-plugin-cloud` crate
-(no separate install step):
+Every cloud verb is built into the `hm` binary (no separate install step):
 
 ```sh
 hm cloud login                  # browser-loopback OAuth (or --paste to

crates/hm/Cargo.toml

@@ -70,7 +70,7 @@ pub enum Command {
 
     /// Interact with the Harmont cloud API.
     #[command(subcommand)]
-    Cloud(hm_plugin_cloud::cli::CloudCommand),
+    Cloud(crate::commands::cloud::cli::CloudCommand),
 }
 
 #[derive(Debug, Clone, Subcommand)]
@@ -116,7 +116,7 @@ pub async fn dispatch(command: Command, ctx: RunContext<'_>) -> Result<i32> {
         Command::Plugin(cmd) => plugin::run(cmd).await.map(|()| 0),
         Command::Cloud(cmd) => {
             let env = std::env::vars().collect();
-            hm_plugin_cloud::cli::dispatch_command(cmd, env, app).await
+            crate::commands::cloud::cli::dispatch_command(cmd, env, app).await
         }
     }
 }

crates/hm/README.md

@@ -17,7 +17,7 @@ use anyhow::{Result, bail};
 use harmont_cloud::{HarmontClient, HarmontError};
 use hm_core::app_ctx::AppCtx;
 
-use crate::settings;
+use crate::commands::cloud::settings;
 
 pub(crate) async fn run(
     env: &BTreeMap<String, String>,