feat(wash): Adds support for wasmcloud named things for packages

This also integrates the wkg.toml stuff directly into wasmcloud.toml

Signed-off-by: Taylor Thomas <taylor@cosmonic.com>

Author: thomastaylor312

Cargo.lock

@@ -290,7 +290,7 @@ serde_cbor = { version = "0.11", default-features = false }
 serde_json = { version = "1", default-features = false }
 serde_with = { version = "3", default-features = false }
 serde_yaml = { version = "0.9", default-features = false }
-serial_test = { version = "0.9", default-features = false }
+serial_test = { version = "3", default-features = false }
 sha2 = { version = "0.10", default-features = false }
 sysinfo = { version = "0.27", default-features = false }
 tempfile = { version = "3", default-features = false }

Cargo.toml

@@ -62,7 +62,7 @@ pub struct BuildCommand {
 }
 
 pub async fn handle_command(command: BuildCommand) -> Result<CommandOutput> {
-    let config = load_config(command.config_path, Some(true))?;
+    let config = load_config(command.config_path, Some(true)).await?;
 
     match config.project_type {
         TypeConfig::Component(ref component_config) => {

crates/wash-cli/src/build.rs

@@ -122,7 +122,7 @@ pub async fn handle_command(
 ) -> Result<CommandOutput> {
     let current_dir = std::env::current_dir()?;
     let project_path = cmd.code_dir.unwrap_or(current_dir);
-    let project_cfg = load_config(Some(project_path.clone()), Some(true))?;
+    let project_cfg = load_config(Some(project_path.clone()), Some(true)).await?;
 
     let mut wash_dev_session = WashDevSession::from_sessions_file(&project_path)
         .await

crates/wash-cli/src/cmd/dev/mod.rs

@@ -91,7 +91,7 @@ pub async fn registry_push(
     cmd: RegistryPushCommand,
     output_kind: OutputKind,
 ) -> Result<CommandOutput> {
-    let project_config = load_config(cmd.project_config, Some(true)).ok();
+    let project_config = load_config(cmd.project_config, Some(true)).await.ok();
     let image: Reference = resolve_artifact_ref(
         &cmd.url,
         &cmd.registry.unwrap_or_default(),
@@ -199,6 +199,7 @@ fn resolve_artifact_ref(
 
 async fn resolve_registry_credentials(registry: &str) -> Result<RegistryCredential> {
     let credentials = if let Ok(credentials) = load_config(None, Some(true))
+        .await
         .and_then(|config| config.resolve_registry_credentials(registry))
     {
         credentials

crates/wash-cli/src/common/registry_cmd.rs

@@ -1,17 +1,15 @@
 // This is pretty much a copy of the wkg wit subcommand adapted for wash
 use std::path::PathBuf;
 
-use anyhow::Ok;
+use anyhow::Context;
 use clap::{Args, Subcommand};
 use wash_lib::{
-    build::monkey_patch_fetch_logging,
+    build::{load_lock_file, monkey_patch_fetch_logging},
     cli::{CommandOutput, CommonPackageArgs},
+    parser::load_config,
 };
 use wasm_pkg_client::{PublishOpts, Registry};
-use wasm_pkg_core::{
-    lock::LockFile,
-    wit::{self, OutputType},
-};
+use wasm_pkg_core::wit::{self, OutputType};
 
 /// Commands for interacting with wit
 #[derive(Debug, Subcommand, Clone)]
@@ -25,7 +23,7 @@ pub enum WitCommand {
     /// dependencies and write them to the `deps` directory along with a lock file. If no lock file
     /// exists, it will fetch all dependencies. If a lock file exists, it will fetch any
     /// dependencies that are not in the lock file and update the lock file.
-    Fetch(FetchArgs),
+    Deps(DepsArgs),
     /// Publish a WIT package to a registry. This will automatically infer the package name from the
     /// WIT package.
     Publish(PublishArgs),
@@ -35,7 +33,7 @@ impl WitCommand {
     pub async fn run(self) -> anyhow::Result<CommandOutput> {
         match self {
             WitCommand::Build(args) => args.run().await,
-            WitCommand::Fetch(args) => args.run().await,
+            WitCommand::Deps(args) => args.run().await,
             WitCommand::Publish(args) => args.run().await,
         }
     }
@@ -54,10 +52,14 @@ pub struct BuildArgs {
 
     #[clap(flatten)]
     pub common: CommonPackageArgs,
+
+    /// Path to the wasmcloud.toml file or parent folder to use for building
+    #[clap(short = 'p', long = "config-path")]
+    config_path: Option<PathBuf>,
 }
 
 #[derive(Debug, Args, Clone)]
-pub struct FetchArgs {
+pub struct DepsArgs {
     /// The directory containing the WIT files to fetch dependencies for.
     #[clap(short = 'd', long = "wit-dir", default_value = "wit")]
     pub dir: PathBuf,
@@ -69,6 +71,10 @@ pub struct FetchArgs {
 
     #[clap(flatten)]
     pub common: CommonPackageArgs,
+
+    /// Path to the wasmcloud.toml file or parent folder to use for building
+    #[clap(short = 'p', long = "config-path")]
+    config_path: Option<PathBuf>,
 }
 
 #[derive(Args, Debug, Clone)]
@@ -87,8 +93,15 @@ pub struct PublishArgs {
 impl BuildArgs {
     pub async fn run(self) -> anyhow::Result<CommandOutput> {
         let client = self.common.get_client().await?;
-        let wkg_config = wasm_pkg_core::config::Config::load().await?;
-        let mut lock_file = LockFile::load(false).await?;
+        // Attempt to load wasmcloud.toml. If it doesn't work, attempt to load wkg.toml
+        let wkg_config = if let Ok(proj) = load_config(self.config_path, Some(true)).await {
+            proj.package_config
+        } else {
+            wasm_pkg_core::config::Config::load().await?
+        };
+        let mut lock_file =
+            load_lock_file(std::env::current_dir().context("failed to get current directory")?)
+                .await?;
         let (pkg_ref, version, bytes) =
             wit::build_package(&wkg_config, self.dir, &mut lock_file, client).await?;
         let output_path = if let Some(path) = self.output_file {
@@ -118,11 +131,18 @@ impl BuildArgs {
     }
 }
 
-impl FetchArgs {
+impl DepsArgs {
     pub async fn run(self) -> anyhow::Result<CommandOutput> {
         let client = self.common.get_client().await?;
-        let wkg_config = wasm_pkg_core::config::Config::load().await?;
-        let mut lock_file = LockFile::load(false).await?;
+        // Attempt to load wasmcloud.toml. If it doesn't work, attempt to load wkg.toml
+        let wkg_config = if let Ok(proj) = load_config(self.config_path, Some(true)).await {
+            proj.package_config
+        } else {
+            wasm_pkg_core::config::Config::load().await?
+        };
+        let mut lock_file =
+            load_lock_file(std::env::current_dir().context("failed to get current directory")?)
+                .await?;
         monkey_patch_fetch_logging(wkg_config, self.dir, &mut lock_file, client).await?;
         // Now write out the lock file since everything else succeeded
         lock_file.write().await?;

crates/wash-cli/src/wit.rs

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-wasi"

crates/wash-cli/tests/fixtures/integrated-wkg/.cargo/config.toml

@@ -0,0 +1,3 @@
+build/
+wit/deps/
+Cargo.lock

crates/wash-cli/tests/fixtures/integrated-wkg/.gitignore

@@ -0,0 +1,15 @@
+[package]
+name = "ponger-config-component"
+edition = "2021"
+description = """
+A wit-based actor that returns data values in response to wRPC invocations.
+"""
+version = "0.1.0"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+wit-bindgen = "0.34"
+
+[workspace]

crates/wash-cli/tests/fixtures/integrated-wkg/Cargo.toml

@@ -0,0 +1,10 @@
+package test-components:testing@0.1.0;
+
+/// Invoke a component with a `ping` function and, ideally, receive "pong"
+interface pingpong {
+  /// Call ping, get a pong back
+  ping: func() -> string;
+
+  /// Call ping, but quietly, and get a secret pong back
+  ping-secret: func() -> string;
+}

crates/wash-cli/tests/fixtures/integrated-wkg/extra-wit/pingpong.wit

@@ -0,0 +1,17 @@
+wit_bindgen::generate!({ generate_all });
+
+use exports::test_components::testing::*;
+
+struct Component;
+
+impl pingpong::Guest for Component {
+    fn ping() -> String {
+        "helloworld".to_string()
+    }
+
+    fn ping_secret() -> String {
+        "helloworld".to_string()
+    }
+}
+
+export!(Component);

crates/wash-cli/tests/fixtures/integrated-wkg/src/lib.rs

@@ -0,0 +1,9 @@
+name = "ponger-config-component"
+language = "rust"
+type = "component"
+
+[component]
+wasm_target = "wasm32-wasip2"
+
+[overrides]
+"test-components:testing" = { path = "./extra-wit" }

tests/components/rust/ponger-config-component/wkg.lock crates/wash-cli/tests/fixtures/integrated-wkg/wasmcloud.lock

@@ -0,0 +1,9 @@
+package test-components:ponger-config;
+
+world component {
+  export test-components:testing/pingpong@0.1.0;
+  // These are not used in the test, but just making sure the build process can handle local and
+  // remote deps
+  import wasmcloud:secrets/store@0.1.0-draft;
+  import wasmcloud:secrets/reveal@0.1.0-draft;
+}

crates/wash-cli/tests/fixtures/integrated-wkg/wasmcloud.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-wasi"

crates/wash-cli/tests/fixtures/integrated-wkg/wit/world.wit

@@ -0,0 +1,3 @@
+build/
+wit/deps/
+Cargo.lock

crates/wash-cli/tests/fixtures/separate-wkg/.cargo/config.toml

@@ -0,0 +1,15 @@
+[package]
+name = "ponger-config-component"
+edition = "2021"
+description = """
+A wit-based actor that returns data values in response to wRPC invocations.
+"""
+version = "0.1.0"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+wit-bindgen = "0.34"
+
+[workspace]

crates/wash-cli/tests/fixtures/separate-wkg/.gitignore

@@ -0,0 +1,10 @@
+package test-components:testing@0.1.0;
+
+/// Invoke a component with a `ping` function and, ideally, receive "pong"
+interface pingpong {
+  /// Call ping, get a pong back
+  ping: func() -> string;
+
+  /// Call ping, but quietly, and get a secret pong back
+  ping-secret: func() -> string;
+}

crates/wash-cli/tests/fixtures/separate-wkg/Cargo.toml

@@ -0,0 +1,17 @@
+wit_bindgen::generate!({ generate_all });
+
+use exports::test_components::testing::*;
+
+struct Component;
+
+impl pingpong::Guest for Component {
+    fn ping() -> String {
+        "helloworld".to_string()
+    }
+
+    fn ping_secret() -> String {
+        "helloworld".to_string()
+    }
+}
+
+export!(Component);

crates/wash-cli/tests/fixtures/separate-wkg/extra-wit/pingpong.wit

@@ -0,0 +1,12 @@
+# This file is automatically generated.
+# It is not intended for manual editing.
+version = 1
+
+[[packages]]
+name = "wasmcloud:secrets"
+registry = "wasmcloud.com"
+
+[[packages.versions]]
+requirement = "=0.1.0-draft"
+version = "0.1.0-draft"
+digest = "sha256:aab5d8d6ecbc17d8237f269e05170fabcf8704738c60b8f1bf09a13fc6855ffb"

crates/wash-cli/tests/fixtures/separate-wkg/src/lib.rs

@@ -0,0 +1,6 @@
+name = "ponger-config-component"
+language = "rust"
+type = "component"
+
+[component]
+wasm_target = "wasm32-wasip2"

crates/wash-cli/tests/fixtures/separate-wkg/wasmcloud.lock

@@ -0,0 +1,9 @@
+package test-components:ponger-config;
+
+world component {
+  export test-components:testing/pingpong@0.1.0;
+  // These are not used in the test, but just making sure the build process can handle local and
+  // remote deps
+  import wasmcloud:secrets/store@0.1.0-draft;
+  import wasmcloud:secrets/reveal@0.1.0-draft;
+}