misc: merge main

.circleci/config.yml

@@ -148,7 +148,7 @@ jobs:
       - restore-cargo-cache
       - install-protoc
       - run: cargo fmt --all --check
-      # TODO: this is incompatible with workspace inheritance, uncomment when 
+      # TODO: this is incompatible with workspace inheritance, uncomment when
       # https://github.com/DevinR528/cargo-sort/pull/29 is merged
       # - run: cargo install cargo-sort
       # - run: cargo sort --check --workspace
@@ -185,7 +185,7 @@ jobs:
       - install-protoc
       - apply-patches
       - run: cargo fmt --all --check --manifest-path << parameters.path >>/Cargo.toml
-      # TODO: this is incompatible with workspace inheritance, uncomment when 
+      # TODO: this is incompatible with workspace inheritance, uncomment when
       # https://github.com/DevinR528/cargo-sort/pull/29 is merged
       # - run: cargo install cargo-sort
       # - run: cargo sort --check << parameters.path >>

cargo-shuttle/src/lib.rs

@@ -27,7 +27,6 @@ use futures::{StreamExt, TryFutureExt};
 use git2::{Repository, StatusOptions};
 use ignore::overrides::OverrideBuilder;
 use ignore::WalkBuilder;
-use provisioner_server::LocalProvisioner;
 use shuttle_common::models::{project, secret};
 use shuttle_service::loader::{build_crate, Runtime};
 use std::fmt::Write;
@@ -38,6 +37,7 @@ use uuid::Uuid;
 
 use crate::args::{DeploymentCommand, ProjectCommand};
 use crate::client::Client;
+use crate::provisioner_server::LocalProvisioner;
 
 pub struct Shuttle {
     ctx: RequestContext,
@@ -479,6 +479,7 @@ impl Shuttle {
 
         trace!(response = ?response,  "client response: ");
 
+        // TODO: move to runtime
         let addr = if run_args.external {
             std::net::IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))
         } else {

deployer/tests/deploy_layer/bind-panic/Cargo.toml

@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"

deployer/tests/deploy_layer/main-panic/Cargo.toml

@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"

deployer/tests/deploy_layer/self-stop/Cargo.toml

@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"

deployer/tests/deploy_layer/sleep-async/Cargo.toml

@@ -12,4 +12,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tokio = { version = "1.0", features = ["time"]}
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"

deployer/tests/resources/tests-fail/Cargo.toml

@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rocket = "0.5.0-rc.2"
-shuttle-service = { path = "../../../../service", features = ["codegen", "web-rocket"] }
+shuttle-service = { path = "../../../../service", features = ["web-rocket"] }

deployer/tests/resources/tests-pass/Cargo.toml

@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rocket = "0.5.0-rc.2"
-shuttle-service = { path = "../../../../service", features = ["codegen", "web-rocket"] }
+shuttle-service = { path = "../../../../service", features = ["web-rocket"] }

service/tests/resources/sleep-async/Cargo.toml

@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tokio = { version = "1.22.0", features = ["time"] }
-shuttle-service = { path = "../../../", features = ["codegen"] }
+shuttle-service = { path = "../../../" }

shell.nix

@@ -12,8 +12,8 @@ in
     ];
     buildInputs = with nixpkgs; [
       ((rustChannelOf{ channel = "1.65.0"; }).rust.override {
-        targets = ["wasm32-wasi"];
         extensions = ["rust-src"];
+        targets = ["wasm32-wasi"];
       })
       cargo-watch
       terraform