Avoid creating symlink in src dir from build.rs (#294)

* Avoid creating symlink in src dir from build.rs

* Clippy

Author: vigoo

Cargo.lock

@@ -62,7 +62,7 @@ pub fn all(context: Arc<ContextInfo>) -> Vec<Trial> {
     let cli = CliLive::make(&context).unwrap().with_long_args();
     let ctx = (context, cli);
     vec![Trial::test_in_context(
-        format!("service_is_responsive_to_shard_changes"),
+        "service_is_responsive_to_shard_changes".to_string(),
         ctx.clone(),
         service_is_responsive_to_shard_changes,
     )]
@@ -82,13 +82,12 @@ fn start_shard(context: &mut Context) {
         .map(|we| we.shard_id)
         .collect();
     let mut ids = (0..10)
-        .into_iter()
         .filter(|i| !used_ids.contains(i))
         .collect::<Vec<_>>();
     let mut rng = thread_rng();
     ids.shuffle(&mut rng);
 
-    match ids.get(0) {
+    match ids.first() {
         Some(id) => {
             match WorkerExecutor::start(
                 context.docker,
@@ -139,7 +138,7 @@ fn make_env_unstable(context: Context, stop_rx: Receiver<()>) {
     println!("!!! Starting Golem Sharding Tester");
 
     fn worker(context: &mut Context) {
-        let mut commands = vec![
+        let mut commands = [
             Command::StartShard,
             Command::StopShard,
             Command::RestartShardManager,
@@ -290,7 +289,7 @@ fn get_invocation_key_invoke_and_await_with_retry(
     params: &str,
     cli: &CliLive,
 ) -> Result<Value, Failed> {
-    let key = get_invocation_key_with_retry(&template_id, &worker_name, &cli)?;
+    let key = get_invocation_key_with_retry(template_id, worker_name, cli)?;
     let res =
         invoke_and_await_result_with_retry(template_id, worker_name, function, params, &key, cli);
     println!("*** WORKER {worker_name} INVOKED ***");

golem-cli/tests/sharding.rs

@@ -91,7 +91,6 @@ warp = { workspace = true }
 
 [build-dependencies]
 cargo_metadata = "0.18.1"
-symlink = "0.1.0"
 
 [[test]]
 name = "integration"

golem-worker-executor-base/Cargo.toml

@@ -1,19 +1,16 @@
 use cargo_metadata::MetadataCommand;
+use std::env::var_os;
 use std::path::Path;
-use symlink::{remove_symlink_dir, symlink_dir};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let golem_wit_root = find_package_root("golem-wit");
-    let target_root = Path::new("./golem-wit");
-    if target_root.exists() {
-        let _ = remove_symlink_dir(target_root);
-    }
-    println!(
-        "Creating symlink from {} to {}",
-        golem_wit_root,
-        target_root.display()
-    );
-    symlink_dir(golem_wit_root, target_root)?;
+    let out_dir = var_os("OUT_DIR").unwrap();
+    let target_file = Path::new(&out_dir).join("preview2_mod.rs");
+
+    std::fs::write(target_file, preview2_mod_gen(&golem_wit_root)).unwrap();
+
+    println!("cargo::rerun-if-changed=build.rs");
+
     Ok(())
 }
 
@@ -25,3 +22,41 @@ fn find_package_root(name: &str) -> String {
     let package = metadata.packages.iter().find(|p| p.name == name).unwrap();
     package.manifest_path.parent().unwrap().to_string()
 }
+
+fn preview2_mod_gen(golem_wit_path: &str) -> String {
+    format!(
+        r#"wasmtime::component::bindgen!({{
+        path: "{golem_wit_path}/wit",
+        interfaces: "
+          import golem:api/[email protected];
+
+          import wasi:blobstore/blobstore;
+          import wasi:blobstore/container;
+          import wasi:blobstore/types;
+          import wasi:keyvalue/[email protected];
+          import wasi:keyvalue/[email protected];
+          import wasi:keyvalue/[email protected];
+          import wasi:keyvalue/[email protected];
+          import wasi:keyvalue/[email protected];
+          import wasi:keyvalue/[email protected];
+          import wasi:logging/logging;
+        ",
+        tracing: false,
+        async: true,
+        with: {{
+            "wasi:io/streams/input-stream": InputStream,
+            "wasi:io/streams/output-stream": OutputStream,
+            "wasi:io/poll/pollable": Pollable,
+            "wasi:blobstore/container/container": super::durable_host::blobstore::types::ContainerEntry,
+            "wasi:blobstore/container/stream-object-names": super::durable_host::blobstore::types::StreamObjectNamesEntry,
+            "wasi:blobstore/types/incoming-value": super::durable_host::blobstore::types::IncomingValueEntry,
+            "wasi:blobstore/types/outgoing-value": super::durable_host::blobstore::types::OutgoingValueEntry,
+            "wasi:keyvalue/wasi-keyvalue-error/error": super::durable_host::keyvalue::error::ErrorEntry,
+            "wasi:keyvalue/types/bucket": super::durable_host::keyvalue::types::BucketEntry,
+            "wasi:keyvalue/types/incoming-value": super::durable_host::keyvalue::types::IncomingValueEntry,
+            "wasi:keyvalue/types/outgoing-value": super::durable_host::keyvalue::types::OutgoingValueEntry,
+        }}
+    }});
+        "#
+    )
+}

golem-worker-executor-base/build.rs

@@ -12,38 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-wasmtime::component::bindgen!({
-    path: "golem-wit/wit",
-    interfaces: "
-      import golem:api/[email protected];
-
-      import wasi:blobstore/blobstore;
-      import wasi:blobstore/container;
-      import wasi:blobstore/types;
-      import wasi:keyvalue/[email protected];
-      import wasi:keyvalue/[email protected];
-      import wasi:keyvalue/[email protected];
-      import wasi:keyvalue/[email protected];
-      import wasi:keyvalue/[email protected];
-      import wasi:keyvalue/[email protected];
-      import wasi:logging/logging;
-    ",
-    tracing: false,
-    async: true,
-    with: {
-        "wasi:io/streams/input-stream": InputStream,
-        "wasi:io/streams/output-stream": OutputStream,
-        "wasi:io/poll/pollable": Pollable,
-        "wasi:blobstore/container/container": super::durable_host::blobstore::types::ContainerEntry,
-        "wasi:blobstore/container/stream-object-names": super::durable_host::blobstore::types::StreamObjectNamesEntry,
-        "wasi:blobstore/types/incoming-value": super::durable_host::blobstore::types::IncomingValueEntry,
-        "wasi:blobstore/types/outgoing-value": super::durable_host::blobstore::types::OutgoingValueEntry,
-        "wasi:keyvalue/wasi-keyvalue-error/error": super::durable_host::keyvalue::error::ErrorEntry,
-        "wasi:keyvalue/types/bucket": super::durable_host::keyvalue::types::BucketEntry,
-        "wasi:keyvalue/types/incoming-value": super::durable_host::keyvalue::types::IncomingValueEntry,
-        "wasi:keyvalue/types/outgoing-value": super::durable_host::keyvalue::types::OutgoingValueEntry,
-    }
-});
+include!(concat!(env!("OUT_DIR"), "/preview2_mod.rs"));
 
 pub type InputStream = wasmtime_wasi::preview2::InputStream;
 pub type OutputStream = wasmtime_wasi::preview2::OutputStream;