chore: v0.7.1 (#424)

* chore: v0.7.1 * chore: resources v0.7.1 * docs: v0.7.1 * tests: v0.7.1 * tests: fix warp test * tests: fix warp test * tests: fix secrets e2e test * ci: remove hard coded DD env * misc: unintended shell changes * refactor: cargo check suggestion
shuttle-hq · Oct 24, 2022 · 65b71c8 · 65b71c8
1 parent b00671d
commit 65b71c8
Show file tree

Hide file tree

Showing 44 changed files with 100 additions and 99 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-shuttle"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "A cargo command for the shuttle platform (https://www.shuttle.rs/)"
@@ -43,15 +43,15 @@ uuid = { version = "1.1.2", features = ["v4"] }
 webbrowser = "0.7.1"
 
 [dependencies.shuttle-common]
-version = "0.7.0"
+version = "0.7.1"
 path = "../common"
 
 [dependencies.shuttle-secrets]
-version = "0.7.0"
+version = "0.7.1"
 path = "../resources/secrets"
 
 [dependencies.shuttle-service]
-version = "0.7.0"
+version = "0.7.1"
 path = "../service"
 features = ["loader"]
 

diff --git a/cargo-shuttle/README.md b/cargo-shuttle/README.md
@@ -90,7 +90,7 @@ $ cargo shuttle init --rocket my-rocket-app
 
 This should generate the following dependency in `Cargo.toml`:
 ```toml
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
 ```
 
 The following boilerplate code should be generated into `src/lib.rs`:

diff --git a/cargo-shuttle/tests/integration/run.rs b/cargo-shuttle/tests/integration/run.rs
@@ -229,7 +229,7 @@ async fn warp_hello_world() {
         .await
         .unwrap();
 
-    assert_eq!(request_text, "Hello, World");
+    assert_eq!(request_text, "Hello, World!");
 }
 
 #[tokio::test(flavor = "multi_thread")]

diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shuttle-codegen"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "Proc-macro code generator for the shuttle.rs service"

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shuttle-common"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "Common library for the shuttle platform (https://www.shuttle.rs/)"

diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shuttle-deployer"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services"
 
@@ -42,15 +42,15 @@ tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
 uuid = { version = "1.1.2", features = ["v4"] }
 
 [dependencies.shuttle-common]
-version = "0.7.0"
+version = "0.7.1"
 path = "../common"
 
 [dependencies.shuttle-proto]
-version = "0.7.0"
+version = "0.7.1"
 path = "../proto"
 
 [dependencies.shuttle-service]
-version = "0.7.0"
+version = "0.7.1"
 path = "../service"
 features = ["loader"]
 

diff --git a/deployer/tests/deploy_layer/bind-panic/Cargo.toml b/deployer/tests/deploy_layer/bind-panic/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = "0.7.0"
+shuttle-service = "0.7.1"
diff --git a/deployer/tests/deploy_layer/main-panic/Cargo.toml b/deployer/tests/deploy_layer/main-panic/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = "0.7.0"
+shuttle-service = "0.7.1"
diff --git a/deployer/tests/deploy_layer/self-stop/Cargo.toml b/deployer/tests/deploy_layer/self-stop/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = "0.7.0"
+shuttle-service = "0.7.1"
diff --git a/deployer/tests/deploy_layer/sleep-async/Cargo.toml b/deployer/tests/deploy_layer/sleep-async/Cargo.toml
@@ -12,4 +12,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tokio = { version = "1.0", features = ["time"]}
-shuttle-service = "0.7.0"
+shuttle-service = "0.7.1"
diff --git a/e2e/tests/integration/helpers/mod.rs b/e2e/tests/integration/helpers/mod.rs
@@ -341,7 +341,7 @@ impl Services {
 
             run.env("CARGO_HOME", CARGO_HOME.path());
             run.args(["project", "status"])
-                .current_dir(WORKSPACE_ROOT.join("examples").join(project_path));
+                .current_dir(Self::get_project_path(project_path));
             let stdout = run.output().unwrap().stdout;
             let stdout = String::from_utf8(stdout).unwrap();
 
@@ -358,9 +358,8 @@ impl Services {
         panic!("timed out while waiting for deployer to be ready");
     }
 
-    pub fn run_client<'s, I, P>(&self, args: I, path: P) -> Child
+    pub fn run_client<'s, I>(&self, args: I, project_path: &str) -> Child
     where
-        P: AsRef<Path>,
         I: IntoIterator<Item = &'s str>,
     {
         let mut run = Command::new(WORKSPACE_ROOT.join("target/debug/cargo-shuttle"));
@@ -371,26 +370,21 @@ impl Services {
 
         run.env("CARGO_HOME", CARGO_HOME.path());
 
-        run.args(args).current_dir(path);
+        run.args(args)
+            .current_dir(Self::get_project_path(project_path));
         spawn_and_log(&mut run, &self.target, self.color)
     }
 
     pub fn deploy(&self, project_path: &str) {
-        self.run_client(
-            ["project", "new"],
-            WORKSPACE_ROOT.join("examples").join(project_path),
-        )
-        .wait()
-        .ensure_success("failed to run deploy");
+        self.run_client(["project", "new"], project_path)
+            .wait()
+            .ensure_success("failed to run deploy");
 
         self.wait_deployer_ready(project_path, Duration::from_secs(120));
 
-        self.run_client(
-            ["deploy", "--allow-dirty"],
-            WORKSPACE_ROOT.join("examples").join(project_path),
-        )
-        .wait()
-        .ensure_success("failed to run deploy");
+        self.run_client(["deploy", "--allow-dirty"], project_path)
+            .wait()
+            .ensure_success("failed to run deploy");
     }
 
     pub fn get(&self, sub_path: &str) -> RequestBuilder {
@@ -401,4 +395,8 @@ impl Services {
     pub fn post(&self, sub_path: &str) -> RequestBuilder {
         reqwest::blocking::Client::new().post(format!("http://{}/{}", self.proxy_addr, sub_path))
     }
+
+    pub fn get_project_path(project_path: &str) -> PathBuf {
+        WORKSPACE_ROOT.join("examples").join(project_path)
+    }
 }
diff --git a/e2e/tests/integration/rocket.rs b/e2e/tests/integration/rocket.rs
@@ -48,6 +48,13 @@ fn postgres_rocket() {
 #[test]
 fn secrets_rocket() {
     let client = helpers::Services::new_docker("secrets (rocket)", Color::Red);
+    let project_path = helpers::Services::get_project_path("rocket/secrets");
+    std::fs::copy(
+        project_path.join("Secrets.toml.example"),
+        project_path.join("Secrets.toml"),
+    )
+    .unwrap();
+
     client.deploy("rocket/secrets");
     let secret_response: String = client
         .get("secret")

diff --git a/e2e/tests/integration/warp.rs b/e2e/tests/integration/warp.rs
@@ -1,4 +1,4 @@
-use colored::Color;
+use crossterm::style::Color;
 
 use crate::helpers::{self, APPS_FQDN};
 
@@ -15,5 +15,5 @@ fn hello_world_warp() {
         .text()
         .unwrap();
 
-    assert_eq!(request_text, "Hello, world!");
+    assert_eq!(request_text, "Hello, World!");
 }
diff --git a/examples/axum/hello-world/Cargo.toml b/examples/axum/hello-world/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 axum = "0.5"
-shuttle-service = { version = "0.7.0", features = ["web-axum"] }
+shuttle-service = { version = "0.7.1", features = ["web-axum"] }
 sync_wrapper = "0.1"
diff --git a/examples/axum/websocket/Cargo.toml b/examples/axum/websocket/Cargo.toml
@@ -13,6 +13,6 @@ hyper = { version = "0.14", features = ["client", "http2"] }
 hyper-tls = "0.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-shuttle-service = { version = "0.7.0", features = ["web-axum"] }
+shuttle-service = { version = "0.7.1", features = ["web-axum"] }
 sync_wrapper = "0.1"
 tokio = { version = "1", features = ["full"] }
diff --git a/examples/poem/hello-world/Cargo.toml b/examples/poem/hello-world/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 poem = "1.3.35"
-shuttle-service = { version = "0.7.0", features = ["web-poem"] }
+shuttle-service = { version = "0.7.1", features = ["web-poem"] }
diff --git a/examples/poem/mongodb/Cargo.toml b/examples/poem/mongodb/Cargo.toml
@@ -8,5 +8,5 @@ mongodb = "2.3.0"
 poem = "1.3.35"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-shuttle-service = { version = "0.7.0", features = ["web-poem"] }
-shuttle-shared-db = { version = "0.7.0", features = ["mongodb"] }
+shuttle-service = { version = "0.7.1", features = ["web-poem"] }
+shuttle-shared-db = { version = "0.7.1", features = ["mongodb"] }
diff --git a/examples/poem/postgres/Cargo.toml b/examples/poem/postgres/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 poem = "1.3.35"
 serde = "1.0"
-shuttle-service = { version = "0.7.0", features = ["web-poem"] }
-shuttle-shared-db = { version = "0.7.0", features = ["postgres"] }
+shuttle-service = { version = "0.7.1", features = ["web-poem"] }
+shuttle-shared-db = { version = "0.7.1", features = ["postgres"] }
 sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] }
diff --git a/examples/rocket/authentication/Cargo.toml b/examples/rocket/authentication/Cargo.toml
@@ -11,4 +11,4 @@ jsonwebtoken = { version = "8", default-features = false }
 lazy_static = "1.4"
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
diff --git a/examples/rocket/hello-world/Cargo.toml b/examples/rocket/hello-world/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 rocket = "0.5.0-rc.2"
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
diff --git a/examples/rocket/persist/Cargo.toml b/examples/rocket/persist/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 [dependencies]
 rocket = { version = "0.5.0-rc.1", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
-shuttle-persist = "0.7.0"
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
+shuttle-persist = "0.7.1"
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
diff --git a/examples/rocket/postgres/Cargo.toml b/examples/rocket/postgres/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 rocket = { version = "0.5.0-rc.1", features = ["json"] }
 serde = "1.0"
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
-shuttle-shared-db = { version = "0.7.0", features = ["postgres"] }
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
+shuttle-shared-db = { version = "0.7.1", features = ["postgres"] }
 sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] }
diff --git a/examples/rocket/secrets/Cargo.toml b/examples/rocket/secrets/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.62"
 rocket = { version = "0.5.0-rc.1", features = ["json"] }
-shuttle-secrets = "0.7.0"
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
+shuttle-secrets = "0.7.1"
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
diff --git a/examples/rocket/url-shortener/Cargo.toml b/examples/rocket/url-shortener/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 nanoid = "0.4"
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
 serde = "1.0"
-shuttle-service = { version = "0.7.0", features = ["web-rocket"] }
-shuttle-shared-db = { version = "0.7.0", features = ["postgres"] }
+shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
+shuttle-shared-db = { version = "0.7.1", features = ["postgres"] }
 sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] }
 url = "2.2"
diff --git a/examples/salvo/hello-world/Cargo.toml b/examples/salvo/hello-world/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 salvo = "0.34.3"
-shuttle-service = { version = "0.7.0", features = ["web-salvo"] }
+shuttle-service = { version = "0.7.1", features = ["web-salvo"] }
diff --git a/examples/serenity/hello-world/Cargo.toml b/examples/serenity/hello-world/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.62"
 serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
-shuttle-secrets = "0.7.0"
-shuttle-service = { version = "0.7.0", features = ["bot-serenity"] }
+shuttle-secrets = "0.7.1"
+shuttle-service = { version = "0.7.1", features = ["bot-serenity"] }
 tracing = "0.1.35"