Merge branch 'main' into rk/sdk-2507

Author: raymondk

.github/workflows/validate-examples.yml

@@ -0,0 +1,57 @@
+name: Validate Examples
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+env:
+  # When getting Rust dependencies, retry on network error:
+  CARGO_NET_RETRY: 10
+  # Use the local .curlrc
+  CURL_HOME: .
+
+jobs:
+  validate-examples:
+    name: Validate Examples on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+
+      - name: Setup image (Linux)
+        if: ${{ contains(matrix.os, 'ubuntu') }}
+        run: ./.github/scripts/provision-linux-build.sh
+
+      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            ~/.rustup/
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Build icp CLI
+        run: cargo build
+
+      - name: Validate examples
+        run: ./scripts/validate-examples.sh
+
+  aggregate:
+    name: validate-examples:required
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    needs: [validate-examples]
+    steps:
+      - name: check result
+        if: ${{ needs.validate-examples.result != 'success' }}
+        run: exit 1

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 
 * feat: Show `name` in `canister status` command
+* fix: Validate explicit canister paths and throw an error if `canister.yaml` is not found
 
 # v0.1.0-beta.3
 

crates/icp-cli/src/operations/settings.rs

@@ -12,6 +12,7 @@ use snafu::{ResultExt, Snafu};
 use crate::progress::{ProgressManager, ProgressManagerSettings};
 
 #[derive(Debug, Snafu)]
+#[allow(clippy::enum_variant_names)]
 pub(crate) enum SyncSettingsOperationError {
     #[snafu(display("failed to fetch current canister settings for canister {canister}"))]
     FetchCurrentSettings {

crates/icp-cli/tests/project_tests.rs

@@ -139,34 +139,132 @@ fn glob_path() {
         .success();
 }
 
-// TODO(or.ricon): This test is currently not passing, fix it.
-// #[test]
-// fn explicit_path_missing() {
-//     let ctx = TestContext::new();
-
-//     // Setup project
-//     let project_dir = ctx.create_project_dir("icp");
-
-//     // Project manifest
-//     let pm = r#"
-//     canisters:
-//       - my-canister
-//     "#;
-
-//     write_string(
-//         &project_dir.join("icp.yaml"), // path
-//         pm,                            // contents
-//     )
-//     .expect("failed to write project manifest");
-
-//     // Invoke build
-//     ctx.icp()
-//         .current_dir(project_dir)
-//         .args(["build"])
-//         .assert()
-//         .failure()
-//         .stderr(eq("Error: canister path must exist and be a directory \'my-canister\'").trim());
-// }
+#[test]
+fn explicit_path_missing() {
+    let ctx = TestContext::new();
+
+    // Setup project
+    let project_dir = ctx.create_project_dir("icp");
+
+    // Project manifest
+    let pm = r#"
+    canisters:
+      - my-canister
+    "#;
+
+    write_string(
+        &project_dir.join("icp.yaml"), // path
+        pm,                            // contents
+    )
+    .expect("failed to write project manifest");
+
+    // Invoke project show
+    ctx.icp()
+        .current_dir(project_dir)
+        .args(["project", "show"])
+        .assert()
+        .failure()
+        .stderr(contains(
+            "could not locate a canister manifest at: 'my-canister'",
+        ));
+}
+
+#[test]
+fn explicit_path_missing_canister_yaml() {
+    let ctx = TestContext::new();
+
+    // Setup project
+    let project_dir = ctx.create_project_dir("icp");
+
+    // Project manifest
+    let pm = r#"
+    canisters:
+      - my-canister
+    "#;
+
+    write_string(
+        &project_dir.join("icp.yaml"), // path
+        pm,                            // contents
+    )
+    .expect("failed to write project manifest");
+
+    // Create directory but no canister.yaml
+    create_dir_all(&project_dir.join("my-canister")).expect("failed to create canister directory");
+
+    // Invoke project show
+    ctx.icp()
+        .current_dir(project_dir)
+        .args(["project", "show"])
+        .assert()
+        .failure()
+        .stderr(contains(
+            "could not locate a canister manifest at: 'my-canister'",
+        ));
+}
+
+#[test]
+fn explicit_path_with_subdirectory() {
+    let ctx = TestContext::new();
+
+    // Setup project
+    let project_dir = ctx.create_project_dir("icp");
+
+    // Project manifest
+    let pm = r#"
+    canisters:
+      - canisters/backend
+      - canisters/frontend
+    "#;
+
+    write_string(
+        &project_dir.join("icp.yaml"), // path
+        pm,                            // contents
+    )
+    .expect("failed to write project manifest");
+
+    // Backend canister manifest
+    let backend_cm = indoc! {r#"
+        name: backend
+        build:
+          steps:
+            - type: script
+              command: echo "build"
+    "#};
+
+    create_dir_all(&project_dir.join("canisters/backend"))
+        .expect("failed to create backend directory");
+
+    write_string(
+        &project_dir.join("canisters/backend/canister.yaml"),
+        backend_cm,
+    )
+    .expect("failed to write backend manifest");
+
+    // Frontend canister manifest
+    let frontend_cm = indoc! {r#"
+        name: frontend
+        build:
+          steps:
+            - type: script
+              command: echo "build"
+    "#};
+
+    create_dir_all(&project_dir.join("canisters/frontend"))
+        .expect("failed to create frontend directory");
+
+    write_string(
+        &project_dir.join("canisters/frontend/canister.yaml"),
+        frontend_cm,
+    )
+    .expect("failed to write frontend manifest");
+
+    // Invoke project show - should succeed
+    ctx.icp()
+        .current_dir(&project_dir)
+        .args(["project", "show"])
+        .assert()
+        .success();
+}
 
 #[test]
 fn redefine_mainnet_network_disallowed() {
@@ -189,7 +287,7 @@ fn redefine_mainnet_network_disallowed() {
     // Any command that loads the project should fail
     ctx.icp()
         .current_dir(project_dir)
-        .args(["build"])
+        .args(["project", "show"])
         .assert()
         .failure()
         .stderr(contains("`mainnet` is a reserved network name"));

crates/icp/src/project.rs

@@ -143,7 +143,8 @@ pub async fn consolidate_manifest(
     for i in &m.canisters {
         let ms = match i {
             Item::Path(pattern) => {
-                let paths = match is_glob(pattern) {
+                let is_glob_pattern = is_glob(pattern);
+                let paths = match is_glob_pattern {
                     // Explicit path
                     false => vec![pdir.join(pattern)],
 
@@ -163,11 +164,28 @@ pub async fn consolidate_manifest(
                     }
                 };
 
-                let paths = paths
-                    .into_iter()
-                    .filter(|p| p.is_dir()) // Skip missing directories
-                    .filter(|p| p.join(CANISTER_MANIFEST).exists()) // Skip non-canister directories
-                    .collect::<Vec<_>>();
+                let paths = if is_glob_pattern {
+                    // For glob patterns, filter out non-directories and non-canister directories
+                    paths
+                        .into_iter()
+                        .filter(|p| p.is_dir())
+                        .filter(|p| p.join(CANISTER_MANIFEST).exists())
+                        .collect::<Vec<_>>()
+                } else {
+                    // For explicit paths, validate that they exist and contain canister.yaml
+                    let mut validated_paths = vec![];
+                    for p in paths {
+                        if !p.join(CANISTER_MANIFEST).is_file() {
+                            return NotFoundSnafu {
+                                kind: "canister".to_string(),
+                                path: pattern.to_string(),
+                            }
+                            .fail();
+                        }
+                        validated_paths.push(p);
+                    }
+                    validated_paths
+                };
 
                 let mut ms = vec![];
 

examples/icp-recipe-registry-official/icp.yaml

@@ -17,7 +17,7 @@ canisters:
 
   - name: my-canister-with-version
     recipe:
-      type: "@dfinity/prebuilt@v1.0.5"
+      type: "@dfinity/prebuilt@v2.0.0"
       configuration:
         path: ../icp-pre-built/dist/hello_world.wasm
         sha256: 17a05e36278cd04c7ae6d3d3226c136267b9df7525a0657521405e22ec96be7a

examples/icp-recipe-remote-url-official/icp.yaml

@@ -3,7 +3,7 @@
 canisters:
   - name: my-canister
     recipe:
-      type: https://github.com/rikonor/icp-recipes/releases/download/prebuilt-v0.1.2/recipe.hbs
+      type: https://github.com/dfinity/icp-cli-recipes/releases/download/prebuilt-v2.0.0/recipe.hbs
       configuration:
         path: ../icp-pre-built/dist/hello_world.wasm
         sha256: 17a05e36278cd04c7ae6d3d3226c136267b9df7525a0657521405e22ec96be7a

examples/icp-recipe-remote-url/test.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+# Start the HTTP server in the background
+python3 -m http.server 8080 &
+SERVER_PID=$!
+
+# Give the server a moment to start
+sleep 1
+
+# Function to cleanup server on exit
+cleanup() {
+    echo "Stopping HTTP server (PID: $SERVER_PID)"
+    kill $SERVER_PID 2>/dev/null || true
+    wait $SERVER_PID 2>/dev/null || true
+}
+
+# Ensure cleanup happens on script exit
+trap cleanup EXIT
+
+# Run icp project show
+icp project show

examples/icp-wasm-metadata-recipe/icp.yaml

@@ -3,7 +3,7 @@
 canisters:
   - name: my-canister
     recipe:
-      type: prebuilt
+      type: "@dfinity/prebuilt"
       configuration:
         path: ../icp-pre-built/dist/hello_world.wasm
         sha256: 17a05e36278cd04c7ae6d3d3226c136267b9df7525a0657521405e22ec96be7a

examples/icp-wasm-optimization-recipe/icp.yaml

@@ -3,7 +3,7 @@
 canisters:
   - name: my-canister
     recipe:
-      type: prebuilt
+      type: "@dfinity/prebuilt"
       configuration:
         path: ../icp-pre-built/dist/hello_world.wasm
         sha256: 17a05e36278cd04c7ae6d3d3226c136267b9df7525a0657521405e22ec96be7a