ci: cargo near new integration test + gh workflow to autorenew image tag/digest

.github/workflows/crontab_new_template_renewal.yml

@@ -0,0 +1,53 @@
+name: renew docker image tag and digest periodically and on-demand
+
+on:
+  schedule:
+    - cron: '0 1 * * *'  # Runs daily at 1 hour after midnight
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  check_latest_docker_image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - uses: hustcer/setup-nu@v3
+        with:
+          version: "*"
+
+      - name: Run update script
+        shell: nu {0}
+        run: |
+          let record = http get "https://hub.docker.com/v2/namespaces/sourcescan/repositories/cargo-near/tags" | get results | first;
+
+          let mod_content = (
+            open cargo-near/src/commands/new/new-project-template/Cargo.toml.template --raw | lines
+            | each { 
+              |line| if ($line | str starts-with "image = ") { 
+                $'image = "sourcescan/cargo-near:($record.name)"' 
+              } else { $line } 
+            } 
+            | each { 
+              |line| if ($line | str starts-with "image_digest = ") { 
+                $'image_digest = "($record.digest)"' 
+              } else { $line } 
+            } 
+            | to text
+          );
+
+          $mod_content | save -f cargo-near/src/commands/new/new-project-template/Cargo.toml.template
+
+          git diff
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          title: update `cargo near new` template `image` and `image_digest` 

.github/workflows/test.yml

@@ -36,7 +36,11 @@ jobs:
         run: sudo apt-get update && sudo apt-get install --assume-yes libudev-dev
 
       - name: Cargo check
+        env:
+          # info: (overridden by '/home/runner/work/cargo-near/cargo-near/rust-toolchain.toml')
+          RUSTUP_TOOLCHAIN: ${{ env.RUST_MSRV }}
         run: | 
+          rustc -vV
           cargo check -p cargo-near
           cargo check -p cargo-near-build --all-features
 
@@ -56,9 +60,9 @@ jobs:
       - name: "Install stable Rust toolchain"
         uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
+          # channel is really controlled by ./rust-toolchain.toml
           toolchain: stable
-          default: true
+          profile: minimal
 
       - name: Install `wasm32-unknown-unknown`
         run: rustup target add wasm32-unknown-unknown
@@ -68,7 +72,10 @@ jobs:
         run: sudo apt-get update && sudo apt-get install --assume-yes libudev-dev
 
       - name: Run tests
-        run: cargo test --workspace
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "nearprotocol-ci"
+          cargo test --workspace
 
   lint:
     runs-on: ubuntu-latest

cargo-near-build/Cargo.toml

@@ -60,3 +60,4 @@ docker = [
   "dep:nix",
   "dep:shell-words",
 ]
+test_code = []

cargo-near-build/src/lib.rs

@@ -122,6 +122,9 @@ pub mod docker {
     pub use crate::types::near::docker_build::Opts as DockerBuildOpts;
 }
 
+#[cfg(feature = "test_code")]
+pub use crate::types::cargo::metadata::CrateMetadata;
+
 pub use bon;
 pub use camino;
 pub use near_abi;

cargo-near-build/src/types/cargo/metadata.rs

@@ -25,11 +25,14 @@ impl CrateMetadata {
         no_locked: bool,
         cargo_target_dir: Option<&buildtime_env::CargoTargetDir>,
     ) -> eyre::Result<Self> {
-        let (mut metadata, root_package) =
-            get_cargo_metadata(&manifest_path, no_locked, cargo_target_dir)?;
-
-        metadata.target_directory = crate::fs::force_canonicalize_dir(&metadata.target_directory)?;
-        metadata.workspace_root = metadata.workspace_root.canonicalize_utf8()?;
+        let (metadata, root_package) = {
+            let (mut metadata, root_package) =
+                get_cargo_metadata(&manifest_path, no_locked, cargo_target_dir)?;
+            metadata.target_directory =
+                crate::fs::force_canonicalize_dir(&metadata.target_directory)?;
+            metadata.workspace_root = metadata.workspace_root.canonicalize_utf8()?;
+            (metadata, root_package)
+        };
 
         let mut target_directory =
             crate::fs::force_canonicalize_dir(&metadata.target_directory.join("near"))?;
@@ -71,6 +74,32 @@ impl CrateMetadata {
     pub fn formatted_package_name(&self) -> String {
         self.root_package.name.replace('-', "_")
     }
+
+    pub fn find_dependency(&self, dependency_name: &str) -> eyre::Result<&cargo_metadata::Package> {
+        let root_node = self
+            .raw_metadata
+            .resolve
+            .as_ref()
+            .and_then(|dep_graph| {
+                dep_graph
+                .nodes
+                .iter()
+                .find(|node| node.id == self.root_package.id)
+            })
+            .wrap_err("unable to appropriately resolve the dependency graph, perhaps your `Cargo.toml` file is malformed")?;
+
+        root_node
+            .deps
+            .iter()
+            .find(|dep| dep.name == dependency_name)
+            .and_then(|found_dependency| {
+                self.raw_metadata
+                    .packages
+                    .iter()
+                    .find(|pkg| pkg.id == found_dependency.pkg)
+            })
+            .wrap_err(format!("`{}` dependency not found", dependency_name))
+    }
 }
 
 /// Get the result of `cargo metadata`, together with the root package id.

cargo-near/Cargo.toml

@@ -3,7 +3,7 @@ name = "cargo-near"
 version = "0.10.1"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
-rust-version = "1.78.0"
+rust-version = "1.79.0"
 description = "Cargo extension for building Rust smart contracts on NEAR"
 readme = "README.md"
 repository = "https://github.com/near/cargo-near"

cargo-near/src/commands/new/mod.rs

@@ -48,6 +48,10 @@ impl NewContext {
                     .replace(
                         "cargo-near-new-ci-tool-version-self",
                         env!("CARGO_PKG_VERSION"),
+                    )
+                    .replace(
+                        "TEST_BASICS_ON_INCLUDE",
+                        include_str!("./test_basics_on.rs.in"),
                     ),
             )
             .wrap_err_with(|| format!("Failed to write to file: {}", new_file_path.display()))?;
@@ -96,17 +100,20 @@ impl NewContext {
             ));
         }
 
-        let status = std::process::Command::new("git")
+        let child = std::process::Command::new("git")
             .arg("commit")
             .arg("-m")
             .arg("init")
+            .arg("--author=nearprotocol-ci <[email protected]>")
             .current_dir(project_dir)
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
-            .status()?;
-        if !status.success() {
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .spawn()?;
+        let output = child.wait_with_output()?;
+        if !output.status.success() {
+            println!("{}", String::from_utf8_lossy(&output.stderr));
             return Err(color_eyre::eyre::eyre!(
-                "Failed to execute process: `git commit -m init`"
+                "Failed to execute process: `git commit -m init --author='nearprotocol-ci <[email protected]>'`"
             ));
         }
 

cargo-near/src/commands/new/new-project-template/Cargo.toml.template

@@ -30,7 +30,7 @@ near-sdk = "5.4"
 
 [dev-dependencies]
 near-sdk = { version = "5.5", features = ["unit-testing"] }
-near-workspaces = { version = "0.14.0", features = ["unstable"] }
+near-workspaces = { version = "0.14.1", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"
 

cargo-near/src/commands/new/new-project-template/tests/test_basics.rs

@@ -2,22 +2,11 @@ use serde_json::json;
 
 #[tokio::test]
 async fn test_contract_is_operational() -> Result<(), Box<dyn std::error::Error>> {
-    let sandbox = near_workspaces::sandbox().await?;
     let contract_wasm = near_workspaces::compile_project("./").await?;
 
-    let contract = sandbox.dev_deploy(&contract_wasm).await?;
-
-    let user_account = sandbox.dev_create_account().await?;
-
-    let outcome = user_account
-        .call(contract.id(), "set_greeting")
-        .args_json(json!({"greeting": "Hello World!"}))
-        .transact()
-        .await?;
-    assert!(outcome.is_success());
-
-    let user_message_outcome = contract.view("get_greeting").args_json(json!({})).await?;
-    assert_eq!(user_message_outcome.json::<String>()?, "Hello World!");
-
+    test_basics_on(&contract_wasm).await?;
     Ok(())
 }
+
+TEST_BASICS_ON_INCLUDE
+

cargo-near/src/commands/new/test_basics_on.rs.in

@@ -0,0 +1,18 @@
+async fn test_basics_on(contract_wasm: &[u8]) -> Result<(), Box<dyn std::error::Error>> {
+    let sandbox = near_workspaces::sandbox().await?;
+    let contract = sandbox.dev_deploy(contract_wasm).await?;
+
+    let user_account = sandbox.dev_create_account().await?;
+
+    let outcome = user_account
+        .call(contract.id(), "set_greeting")
+        .args_json(json!({"greeting": "Hello World!"}))
+        .transact()
+        .await?;
+    assert!(outcome.is_success());
+
+    let user_message_outcome = contract.view("get_greeting").args_json(json!({})).await?;
+    assert_eq!(user_message_outcome.json::<String>()?, "Hello World!");
+
+    Ok(())
+}

cargo-near/src/lib.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::large_enum_variant)]
 
-pub use near_cli_rs::CliResult;
+pub use near_cli_rs::{CliResult, GlobalContext};
+
 use strum::{EnumDiscriminants, EnumIter, EnumMessage};
 
 pub mod commands;

integration-tests/Cargo.toml

@@ -16,17 +16,19 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 borsh = { version = "1.0.0", features = ["derive", "unstable__schema"] }
 camino = "1.1.1"
 cargo-near = { path = "../cargo-near" }
-cargo-near-build = { version = "0.2.0", path = "../cargo-near-build" }
+cargo-near-build = { version = "0.2.0", path = "../cargo-near-build", features = ["test_code"] }
 color-eyre = "0.6"
 function_name = "0.3"
 git2 = "0.19"
 minifier = "0.3"
 prettyplease = "0.2"
 schemars = "0.8"
+semver = "1.0.23"
 serde_json = "1.0"
 syn = "2"
 tempfile = "3.3"
-tokio = "1.0"
+tokio = { version = "1.12.0", features = ["full"] }
 quote = "1.0"
-near-workspaces = "0.14.0"
+near-workspaces = "0.14.1"
 zstd = "0.13"
+toml = "0.8.19"