diff --git a/Cargo.lock b/Cargo.lock index 1f7e5c6f2..5ca94f337 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1117,7 +1117,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "assert_cmd", @@ -5163,7 +5163,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "clap", @@ -5180,7 +5180,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", @@ -5209,7 +5209,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.16.0" +version = "0.17.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5221,7 +5221,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.16.2" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", @@ -5270,7 +5270,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", @@ -5319,7 +5319,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", @@ -5372,7 +5372,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "chrono", @@ -5389,7 +5389,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.16.0" +version = "0.17.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5415,7 +5415,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", @@ -5447,7 +5447,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-trait", diff --git a/README.md b/README.md index f4576b545..59faaa1bc 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ build status - + discord

diff --git a/cargo-shuttle/README.md b/cargo-shuttle/README.md index 85719c50e..663e21a0d 100644 --- a/cargo-shuttle/README.md +++ b/cargo-shuttle/README.md @@ -13,7 +13,7 @@ build status - + discord

@@ -71,26 +71,28 @@ Run `cargo shuttle help` to see the basic usage: Usage: cargo-shuttle [OPTIONS] Commands: - deploy deploy a shuttle service - deployment manage deployments of a shuttle service - init create a new shuttle service - generate generate shell completions - status view the status of a shuttle service - logs view the logs of a deployment in this shuttle service - clean remove artifacts that were generated by cargo - stop stop this shuttle service - secrets manage secrets for this shuttle service - login login to the shuttle platform - logout log out of the shuttle platform - run run a shuttle service locally - feedback Open an issue on github and provide feedback - project manage a project on shuttle + init Create a new shuttle project + run Run a shuttle service locally + deploy Deploy a shuttle service + deployment Manage deployments of a shuttle service + status View the status of a shuttle service + stop Stop this shuttle service + logs View the logs of a deployment in this shuttle service + project List or manage projects on shuttle + resource Manage resources of a shuttle project + secrets Manage secrets for this shuttle service + clean Remove cargo build artifacts in the shuttle environment + login Login to the shuttle platform + logout Log out of the shuttle platform + generate Generate shell completions + feedback Open an issue on GitHub and provide feedback help Print this message or the help of the given subcommand(s) Options: - --api-url run this command against the api at the supplied url (allows targeting a custom deployed instance for this command only) [env: SHUTTLE_API=] --working-directory Specify the working directory [default: .] --name Specify the name of the project (overrides crate name) + --api-url Run this command against the API at the supplied URL (allows targeting a custom deployed instance for this command only, mainly + for development) [env: SHUTTLE_API=] -h, --help Print help -V, --version Print version ``` @@ -101,22 +103,22 @@ To initialize a shuttle project with boilerplates, run `cargo shuttle init [OPTI Currently, `cargo shuttle init` supports the following frameworks: -- `--actix-web`: for [actix web](https://actix.rs/) framework -- `--axum`: for [axum](https://github.com/tokio-rs/axum) framework -- `--poem`: for [poem](https://github.com/poem-web/poem) framework -- `--poise`: for [poise](https://github.com/serenity-rs/poise) discord bot framework -- `--rocket`: for [rocket](https://rocket.rs/) framework -- `--salvo`: for [salvo](https://salvo.rs/) framework -- `--serenity`: for [serenity](https://github.com/serenity-rs/serenity) discord bot framework -- `--thruster`: for [thruster](https://github.com/thruster-rs/Thruster) framework -- `--tide`: for [tide](https://github.com/http-rs/tide) framework -- `--tower`: for [tower](https://github.com/tower-rs/tower) library -- `--warp`: for [warp](https://github.com/seanmonstar/warp) framework +- `--template actix-web`: for [actix web](https://actix.rs/) framework +- `--template axum`: for [axum](https://github.com/tokio-rs/axum) framework +- `--template poem`: for [poem](https://github.com/poem-web/poem) framework +- `--template poise`: for [poise](https://github.com/serenity-rs/poise) discord bot framework +- `--template rocket`: for [rocket](https://rocket.rs/) framework +- `--template salvo`: for [salvo](https://salvo.rs/) framework +- `--template serenity`: for [serenity](https://github.com/serenity-rs/serenity) discord bot framework +- `--template thruster`: for [thruster](https://github.com/thruster-rs/Thruster) framework +- `--template tide`: for [tide](https://github.com/http-rs/tide) framework +- `--template tower`: for [tower](https://github.com/tower-rs/tower) library +- `--template warp`: for [warp](https://github.com/seanmonstar/warp) framework For example, running the following command will initialize a project for [rocket](https://rocket.rs/): ```sh -cargo shuttle init --rocket my-rocket-app +cargo shuttle init --template rocket my-rocket-app ``` This should generate the following dependency in `Cargo.toml`: @@ -229,4 +231,4 @@ During our alpha period, API keys are completely free and you can deploy as many Just keep in mind that there may be some kinks that require us to take all deployments down once in a while. In certain circumstances we may also have to delete all the data associated with those deployments. -To contribute to `cargo-shuttle` or stay updated with our development, please [open an issue, discussion or PR on Github](https://github.com/shuttle-hq/shuttle) and [join our Discord](https://discord.gg/H33rRDTm3p)! 🚀 +To contribute to `cargo-shuttle` or stay updated with our development, please [open an issue, discussion or PR on Github](https://github.com/shuttle-hq/shuttle) and [join our Discord](https://discord.gg/shuttle)! 🚀 diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs index 1cf861850..da1924377 100644 --- a/cargo-shuttle/src/lib.rs +++ b/cargo-shuttle/src/lib.rs @@ -791,11 +791,6 @@ impl Shuttle { } } - println!( - "Run `cargo shuttle project start` to create a project environment on Shuttle.\n\ - Run `cargo shuttle deploy` to deploy your Shuttle service." - ); - // If prior signal received is set to true we must stop all the existing runtimes and // exit the `local_run`. if signal_received { @@ -856,6 +851,11 @@ impl Shuttle { }; } + println!( + "Run `cargo shuttle project start` to create a project environment on Shuttle.\n\ + Run `cargo shuttle deploy` to deploy your Shuttle service." + ); + Ok(()) } diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml index 19bc6b6f9..df6af311b 100644 --- a/deployer/Cargo.toml +++ b/deployer/Cargo.toml @@ -19,7 +19,6 @@ fqdn = { workspace = true } futures = { workspace = true } home = { workspace = true } hyper = { workspace = true, features = ["client", "http1", "http2", "tcp"] } -# not great, but waiting for WebSocket changes to be merged hyper-reverse-proxy = { workspace = true } once_cell = { workspace = true } opentelemetry = { workspace = true }