Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: v0.14.0 #788

Merged
merged 7 commits into from
Apr 12, 2023
Merged

chore: v0.14.0 #788

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3714c38
chore: v0.14.0
oddgrd Apr 12, 2023
c701a0c
chore: bump examples
oddgrd Apr 12, 2023
adc8f65
fix: archive secret duplication
oddgrd Apr 12, 2023
6266030
fix: ensure secrets are archived in workspaces
oddgrd Apr 12, 2023
1ca7930
fix: also check for secrets in workspace
oddgrd Apr 12, 2023
9274a38
fix: avoid duplication of secrets in archive
oddgrd Apr 12, 2023
0285c83
fix: clippy
oddgrd Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ exclude = [
]

[workspace.package]
version = "0.13.0"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/shuttle-hq/shuttle"

# https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
[workspace.dependencies]
shuttle-codegen = { path = "codegen", version = "0.13.0" }
shuttle-common = { path = "common", version = "0.13.0" }
shuttle-proto = { path = "proto", version = "0.13.0" }
shuttle-service = { path = "service", version = "0.13.0" }
shuttle-codegen = { path = "codegen", version = "0.14.0" }
shuttle-common = { path = "common", version = "0.14.0" }
shuttle-proto = { path = "proto", version = "0.14.0" }
shuttle-service = { path = "service", version = "0.14.0" }

anyhow = "1.0.66"
async-trait = "0.1.58"
Expand Down
2 changes: 1 addition & 1 deletion admin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-admin"
version = "0.13.0"
version = "0.14.0"
edition = "2021"

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-shuttle"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down Expand Up @@ -65,7 +65,7 @@ features = ["models"]
workspace = true

[dependencies.shuttle-secrets]
version = "0.13.0"
version = "0.14.0"
path = "../resources/secrets"

[dependencies.shuttle-service]
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ This should generate the following dependency in `Cargo.toml`:

```toml
rocket = "0.5.0-rc.2"
shuttle-rocket = { version = "0.13.0" }
shuttle-runtime = { version = "0.13.0" }
shuttle-rocket = { version = "0.14.0" }
shuttle-runtime = { version = "0.14.0" }
tokio = { version = "1.26.0" }
```

Expand Down
25 changes: 8 additions & 17 deletions cargo-shuttle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,18 +855,15 @@ impl Shuttle {
{
let dir_entry = dir_entry.context("get directory entry")?;

if dir_entry.file_type().context("get file type")?.is_dir() {
let secrets_path = dir_entry.path().join("Secrets.toml");

// Make sure to add any `Secrets.toml` files in the subdirectories.
if secrets_path.exists() {
let path = secrets_path
.strip_prefix(base_directory)
.context("strip the base of the archive entry")?;
tar.append_path_with_name(secrets_path.clone(), path)?;
}
let secrets_path = dir_entry.path().join("Secrets.toml");

// Make sure to add any `Secrets.toml` files.
if secrets_path.exists() {
tar.append_path_with_name(secrets_path, Path::new("shuttle").join("Secrets.toml"))?;
oddgrd marked this conversation as resolved.
Show resolved Hide resolved
}

// It's not possible to add a directory to an archive
// It's not possible to add a directory to an archive
if dir_entry.file_type().context("get file type")?.is_dir() {
continue;
}

Expand All @@ -879,12 +876,6 @@ impl Shuttle {
.context("archive entry")?;
}

// Make sure to add any `Secrets.toml` files in the root of the workspace.
let secrets_path = self.ctx.working_directory().join("Secrets.toml");
if secrets_path.exists() {
tar.append_path_with_name(secrets_path, Path::new("shuttle").join("Secrets.toml"))?;
}
oddgrd marked this conversation as resolved.
Show resolved Hide resolved

let encoder = tar.into_inner().context("get encoder from tar archive")?;
let bytes = encoder.finish().context("finish up encoder")?;

Expand Down
2 changes: 1 addition & 1 deletion codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-codegen"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-common"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion deployer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-deployer"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services"
Expand Down
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/bind-panic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.13.0"
shuttle-runtime = "0.14.0"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/main-panic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.13.0"
shuttle-runtime = "0.14.0"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/self-stop/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.13.0"
shuttle-runtime = "0.14.0"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/sleep-async/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.13.0"
shuttle-runtime = "0.14.0"
tokio = { version = "1.0", features = ["time"]}
2 changes: 1 addition & 1 deletion examples
Open in desktop
Submodule examples updated from f583ef to 54e361
2 changes: 1 addition & 1 deletion gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-gateway"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
publish = false
Expand Down
4 changes: 2 additions & 2 deletions resources/aws-rds/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-aws-rds"
version = "0.13.0"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to provision AWS RDS resources"
Expand All @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "rds"]
async-trait = "0.1.56"
paste = "1.0.7"
serde = { version = "1.0.148", features = ["derive"] }
shuttle-service = { path = "../../service", version = "0.13.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.14.0", default-features = false }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] }

[features]
Expand Down
6 changes: 3 additions & 3 deletions resources/persist/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-persist"
version = "0.13.0"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
description = "Plugin for persist objects"
Expand All @@ -10,6 +10,6 @@ keywords = ["shuttle-service", "persistence"]
async-trait = "0.1.56"
bincode = "1.2.1"
serde = { version = "1.0.0", features = ["derive"] }
shuttle-common = { path = "../../common", version = "0.13.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.13.0", default-features = false }
shuttle-common = { path = "../../common", version = "0.14.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.14.0", default-features = false }
thiserror = "1.0.32"
4 changes: 2 additions & 2 deletions resources/secrets/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-secrets"
version = "0.13.0"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to for managing secrets on shuttle"
Expand All @@ -9,4 +9,4 @@ keywords = ["shuttle-service", "secrets"]
[dependencies]
async-trait = "0.1.56"
serde = { version = "1.0.148", features = ["derive"] }
shuttle-service = { path = "../../service", version = "0.13.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.14.0", default-features = false }
4 changes: 2 additions & 2 deletions resources/shared-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-shared-db"
version = "0.13.0"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
description = "Plugin for managing shared databases on shuttle"
Expand All @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "database"]
async-trait = "0.1.56"
mongodb = { version = "2.3.0", optional = true }
serde = { version = "1.0.148", features = ["derive"] }
shuttle-service = { path = "../../service", version = "0.13.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.14.0", default-features = false }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true }

[features]
Expand Down
4 changes: 2 additions & 2 deletions resources/static-folder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-static-folder"
version = "0.13.1"
version = "0.14.0"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to get a static folder at runtime on shuttle"
Expand All @@ -11,7 +11,7 @@ async-trait = "0.1.56"
dunce = "1.0.3"
fs_extra = "1.3.0"
serde = { version = "1.0.148", features = ["derive"] }
shuttle-service = { path = "../../service", version = "0.13.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.14.0", default-features = false }
tracing = "0.1.37"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-runtime"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
description = "Runtime to start and manage any service that runs on shuttle"
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
//! be a binary crate with a few dependencies including `shuttle-runtime` and `shuttle-axum`.
//!
//! ```toml
//! shuttle-runtime = "0.13.0"
//! shuttle-runtime = "0.14.0"
//! axum = "0.6.10"
//! shuttle-axum = "0.13.0"
//! shuttle-axum = "0.14.0"
//! tokio = "1.26"
//! ```
//!
Expand Down Expand Up @@ -113,7 +113,7 @@
//! `runtime-tokio-native-tls` and `postgres` features inside `Cargo.toml`:
//!
//! ```toml
//! shuttle-shared-db = { version = "0.13.0", features = ["postgres"] }
//! shuttle-shared-db = { version = "0.14.0", features = ["postgres"] }
//! sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
//! ```
//!
Expand Down
2 changes: 1 addition & 1 deletion service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-service"
version = "0.13.0"
version = "0.14.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
Loading