Merge branch 'fermyon:main' into issue/2335/fix-swallowed-mqtt-errors

Author: suneetnangia

.github/actions/spin-ci-dependencies/action.yml

@@ -78,8 +78,8 @@ inputs:
     default: 'false'
     type: bool
 
-  vcpkg:
-    description: 'setup vcpkg'
+  openssl-windows:
+    description: 'setup openssl on windows'
     required: false
     default: 'false'
     type: bool
@@ -91,7 +91,7 @@ runs:
       shell: bash
       if: ${{ inputs.rust == 'true' }}
       run: |
-        rustup toolchain install ${{ inputs.rust-version }} --component clippy --component rustfmt
+        rustup toolchain install ${{ inputs.rust-version }} --component clippy --component rustfmt --no-self-update
         rustup default ${{ inputs.rust-version }}
 
     - name: "Install Wasm Rust target"
@@ -136,10 +136,10 @@ runs:
       with:
         version: ${{ inputs.tinygo-version }}
 
-    ## Install vcpgk
-    - name: "Install vcpkg"
+    ## Install openssl
+    - name: "Install openssl on windows"
       run: |
         echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
         vcpkg install openssl:x64-windows-static-md
       shell: pwsh
-      if: ${{ inputs.vcpkg == 'true' }}
+      if: ${{ inputs.openssl-windows == 'true' }}

.github/workflows/build.yml

@@ -126,7 +126,7 @@ jobs:
           rust: true
           rust-wasm: true
           rust-cache: true
-          vcpkg: "${{ matrix.os == 'windows-latest' }}"
+          openssl-windows: "${{ matrix.os == 'windows-latest' }}"
 
       - name: Cargo Build
         run: cargo build --workspace --release --all-targets
@@ -257,7 +257,7 @@ jobs:
       - name: Install Rust toolchain
         shell: bash
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }}
+          rustup toolchain install ${{ env.RUST_VERSION }} --no-self-update
           rustup default ${{ env.RUST_VERSION }}
 
       - name: Install target
@@ -280,8 +280,7 @@ jobs:
       - name: setup dependencies
         uses: ./.github/actions/spin-ci-dependencies
         with:
-          vcpkg: "${{ matrix.os == 'windows-latest' }}"
-          openssl-mac: "${{ matrix.os == 'macos-latest' }}"
+          openssl-windows: "${{ matrix.os == 'windows-latest' }}"
 
       - name: build release
         shell: bash

.github/workflows/release.yml

@@ -94,7 +94,7 @@ jobs:
       - name: Install Rust toolchain
         shell: bash
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }}
+          rustup toolchain install ${{ env.RUST_VERSION }} --no-self-update
           rustup default ${{ env.RUST_VERSION }}
 
       - name: Install target
@@ -117,7 +117,7 @@ jobs:
       - name: setup dependencies
         uses: ./.github/actions/spin-ci-dependencies
         with:
-          vcpkg: "${{ matrix.os == 'windows-latest' }}"
+          openssl-windows: "${{ matrix.os == 'windows-latest' }}"
 
       - name: build release
         shell: bash

Cargo.lock

@@ -10,6 +10,10 @@ use cargo_target_dep::build_target_dep;
 const TIMER_TRIGGER_INTEGRATION_TEST: &str = "examples/spin-timer/app-example";
 
 fn main() {
+    // Don't inherit flags from our own invocation of cargo into sub-invocations
+    // since the flags are intended for the host and we're compiling for wasm.
+    std::env::remove_var("CARGO_ENCODED_RUSTFLAGS");
+
     // Extract environment information to be passed to plugins.
     // Git information will be set to defaults if Spin is not
     // built within a Git worktree.

build.rs

@@ -11,3 +11,34 @@ pub fn parse_file_url(url: &str) -> anyhow::Result<PathBuf> {
         .to_file_path()
         .map_err(|_| anyhow!("Invalid file URL path: {url:?}"))
 }
+
+/// Remove the credentials from a URL string
+pub fn remove_credentials(url: &str) -> anyhow::Result<String> {
+    let mut url = url::Url::parse(url).with_context(|| format!("Invalid URL: {url:?}"))?;
+    url.set_username("")
+        .map_err(|_| anyhow!("Could not remove username"))?;
+    url.set_password(None)
+        .map_err(|_| anyhow!("Could not remove password"))?;
+    Ok(url.to_string())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn remove_credentials_removes_credentials() {
+        assert_eq!(
+            "redis://example.com:4567",
+            remove_credentials("redis://example.com:4567").unwrap()
+        );
+        assert_eq!(
+            "redis://example.com:4567",
+            remove_credentials("redis://me:[email protected]:4567").unwrap()
+        );
+        assert_eq!(
+            "http://example.com/users",
+            remove_credentials("http://me:[email protected]/users").unwrap()
+        );
+    }
+}

crates/common/src/url.rs

@@ -15,7 +15,7 @@ mod store;
 pub mod wasi_2023_10_18;
 pub mod wasi_2023_11_10;
 
-use std::{path::PathBuf, sync::Arc, time::Duration};
+use std::{path::PathBuf, time::Duration};
 
 use anyhow::Result;
 use crossbeam_channel::Sender;
@@ -395,14 +395,14 @@ impl<T: OutboundWasiHttpHandler + Send + Sync> Engine<T> {
     /// Creates a new [`InstancePre`] for the given [`Component`].
     #[instrument(skip_all)]
     pub fn instantiate_pre(&self, component: &Component) -> Result<InstancePre<T>> {
-        let inner = Arc::new(self.linker.instantiate_pre(component)?);
+        let inner = self.linker.instantiate_pre(component)?;
         Ok(InstancePre { inner })
     }
 
     /// Creates a new [`ModuleInstancePre`] for the given [`Module`].
     #[instrument(skip_all)]
     pub fn module_instantiate_pre(&self, module: &Module) -> Result<ModuleInstancePre<T>> {
-        let inner = Arc::new(self.module_linker.instantiate_pre(module)?);
+        let inner = self.module_linker.instantiate_pre(module)?;
         Ok(ModuleInstancePre { inner })
     }
 
@@ -424,7 +424,7 @@ impl<T> AsRef<wasmtime::Engine> for Engine<T> {
 ///
 /// See [`wasmtime::component::InstancePre`] for more information.
 pub struct InstancePre<T> {
-    inner: Arc<wasmtime::component::InstancePre<Data<T>>>,
+    inner: wasmtime::component::InstancePre<Data<T>>,
 }
 
 impl<T: Send + Sync> InstancePre<T> {
@@ -453,7 +453,7 @@ impl<T> AsRef<wasmtime::component::InstancePre<Data<T>>> for InstancePre<T> {
 ///
 /// See [`wasmtime::InstancePre`] for more information.
 pub struct ModuleInstancePre<T> {
-    inner: Arc<wasmtime::InstancePre<Data<T>>>,
+    inner: wasmtime::InstancePre<Data<T>>,
 }
 
 impl<T: Send + Sync> ModuleInstancePre<T> {

crates/core/src/lib.rs

@@ -22,7 +22,7 @@ mod bindings {
         path: "../../wit",
         interfaces: r#"
             include wasi:http/[email protected];
-    
+
             // NB: this is handling the historical behavior where Spin supported
             // more than "just" this snaphsot of the proxy world but additionally
             // other CLI-related interfaces.
@@ -156,6 +156,8 @@ where
     wasi::io::poll::add_to_linker(linker, |t| t)?;
     wasi::io::streams::add_to_linker(linker, |t| t)?;
     wasi::random::random::add_to_linker(linker, |t| t)?;
+    wasi::random::insecure::add_to_linker(linker, |t| t)?;
+    wasi::random::insecure_seed::add_to_linker(linker, |t| t)?;
     wasi::cli::exit::add_to_linker(linker, |t| t)?;
     wasi::cli::environment::add_to_linker(linker, |t| t)?;
     wasi::cli::stdin::add_to_linker(linker, |t| t)?;
@@ -898,6 +900,28 @@ where
     }
 }
 
+impl<T> wasi::random::insecure::Host for T
+where
+    T: WasiView,
+{
+    fn get_insecure_random_bytes(&mut self, len: u64) -> wasmtime::Result<Vec<u8>> {
+        <T as latest::random::insecure::Host>::get_insecure_random_bytes(self, len)
+    }
+
+    fn get_insecure_random_u64(&mut self) -> wasmtime::Result<u64> {
+        <T as latest::random::insecure::Host>::get_insecure_random_u64(self)
+    }
+}
+
+impl<T> wasi::random::insecure_seed::Host for T
+where
+    T: WasiView,
+{
+    fn insecure_seed(&mut self) -> wasmtime::Result<(u64, u64)> {
+        <T as latest::random::insecure_seed::Host>::insecure_seed(self)
+    }
+}
+
 impl<T> wasi::cli::exit::Host for T
 where
     T: WasiView,

crates/core/src/wasi_2023_10_18.rs

@@ -21,7 +21,7 @@ mod bindings {
         path: "../../wit",
         interfaces: r#"
             include wasi:http/[email protected];
-    
+
             // NB: this is handling the historical behavior where Spin supported
             // more than "just" this snapshot of the proxy world but additionally
             // other CLI-related interfaces.
@@ -154,6 +154,8 @@ where
     wasi::io::poll::add_to_linker(linker, |t| t)?;
     wasi::io::streams::add_to_linker(linker, |t| t)?;
     wasi::random::random::add_to_linker(linker, |t| t)?;
+    wasi::random::insecure::add_to_linker(linker, |t| t)?;
+    wasi::random::insecure_seed::add_to_linker(linker, |t| t)?;
     wasi::cli::exit::add_to_linker(linker, |t| t)?;
     wasi::cli::environment::add_to_linker(linker, |t| t)?;
     wasi::cli::stdin::add_to_linker(linker, |t| t)?;
@@ -843,6 +845,28 @@ where
     }
 }
 
+impl<T> wasi::random::insecure::Host for T
+where
+    T: WasiView,
+{
+    fn get_insecure_random_bytes(&mut self, len: u64) -> wasmtime::Result<Vec<u8>> {
+        <T as latest::random::insecure::Host>::get_insecure_random_bytes(self, len)
+    }
+
+    fn get_insecure_random_u64(&mut self) -> wasmtime::Result<u64> {
+        <T as latest::random::insecure::Host>::get_insecure_random_u64(self)
+    }
+}
+
+impl<T> wasi::random::insecure_seed::Host for T
+where
+    T: WasiView,
+{
+    fn insecure_seed(&mut self) -> wasmtime::Result<(u64, u64)> {
+        <T as latest::random::insecure_seed::Host>::insecure_seed(self)
+    }
+}
+
 impl<T> wasi::cli::exit::Host for T
 where
     T: WasiView,

crates/core/src/wasi_2023_11_10.rs

@@ -1,7 +1,8 @@
 [package]
 name = "spin-doctor"
-version = "0.1.0"
-edition = "2021"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
 
 [dependencies]
 anyhow = "1"