fix: various fixes (#1641)

* trunk, cargo-leptos

* c-s docs

* fix(cargo-shuttle): --wd don't create directory

* refactor: reduce runtime dependency weight

fix: proto features

fix: layer

add missing features

* add back basic c-s docs

Author: jonaro00

Cargo.lock

@@ -99,7 +99,6 @@ tonic = "0.10.2"
 tower = "0.4.13"
 tower-http = { version = "0.4.0", features = ["trace"] }
 tracing = { version = "0.1.37", default-features = false }
-tracing-core = { version = "0.1.32", default-features = false }
 tracing-opentelemetry = "0.22.0"
 tracing-subscriber = { version = "0.3.16", default-features = false, features = [
   "registry",

Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://www.shuttle.rs"
 
 [dependencies]
 shuttle-common = { workspace = true, features = ["models"] }
-shuttle-proto = { workspace = true, features = ["provisioner", "runtime"] }
+shuttle-proto = { workspace = true, features = ["provisioner", "runtime-client"] }
 shuttle-service = { workspace = true, features = ["builder", "runner"] }
 
 anyhow = { workspace = true }

cargo-shuttle/Cargo.toml

@@ -4,244 +4,51 @@
 # cargo-shuttle
 
 <p align=center>
-  <a href="https://docs.rs/shuttle-service">
+  <a href="https://docs.shuttle.rs/">
     <img alt="docs" src="https://img.shields.io/badge/docs-reference-orange">
   </a>
   <a href="https://github.com/shuttle-hq/shuttle/search?l=rust">
     <img alt="language" src="https://img.shields.io/badge/language-Rust-orange.svg">
   </a>
-  <a href="https://circleci.com/gh/shuttle-hq/shuttle/">
-    <img alt="build status" src="https://circleci.com/gh/shuttle-hq/shuttle.svg?style=shield"/>
-  </a>
   <a href="https://discord.gg/shuttle">
     <img alt="discord" src="https://img.shields.io/discord/803236282088161321?logo=discord"/>
   </a>
 </p>
 <!-- markdownlint-restore -->
-<!-- markdownlint-disable MD001 -->
-
-`cargo-shuttle` is your commandline tool for deploying web apps on [shuttle](https://www.shuttle.rs/), the stateful serverless web platform for Rust.
 
-**README Sections:** [Installation](#installation) — [Subcommands](#subcommands) — [Development](#development)
+`cargo-shuttle` is the command line tool for deploying Rust apps on [Shuttle](https://www.shuttle.rs/), the Rust-native cloud deployment platform.
 
 </div>
 
----
-
-`cargo-shuttle` brings [shuttle](https://www.shuttle.rs/), the open source serverless platform for Rust web applications, into your terminal. With a dedicated focus on productivity, reliability, and performance, `cargo-shuttle` makes deploying your code to the cloud as easy as deriving a trait.
-
----
-
-<!-- markdownlint-disable-next-line -->
-<a id="installation"><h1>Installation</h1></a>
+## Installation
 
-`cargo-shuttle` is available for macOS, Linux, and Windows.
+For the full list of installation options, refer to the [Installation docs](https://docs.shuttle.rs/getting-started/installation).
 
-To install on Linux or macOS, run:
+Linux and macOS:
 
 ```sh
 curl -sSfL https://www.shuttle.rs/install | bash
 ```
 
-On Windows, you can default to installing from source:
-
-```bash
-cargo install cargo-shuttle
-```
-
-### Distro Packages
-
-<!-- markdownlint-disable-next-line -->
-<details>
-<!-- markdownlint-disable-next-line -->
-  <summary>Packaging status</summary>
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/cargo-shuttle.svg)](https://repology.org/project/cargo-shuttle/versions)
-
-</details>
-
-#### Arch Linux
-
-`cargo-shuttle` can be installed from the [extra repository](https://archlinux.org/packages/extra/x86_64/cargo-shuttle) using [pacman](https://wiki.archlinux.org/title/Pacman):
-
-```sh
-pacman -S cargo-shuttle
-```
-
-#### Alpine Linux
-
-`cargo-shuttle` is available for [Alpine Edge](https://pkgs.alpinelinux.org/packages?name=cargo-shuttle&branch=edge). It can be installed via [apk](https://wiki.alpinelinux.org/wiki/Alpine_Package_Keeper) after enabling the [testing repository](https://wiki.alpinelinux.org/wiki/Repositories).
-
-```sh
-apk add cargo-shuttle
-```
-
----
-
-<!-- markdownlint-disable-next-line -->
-<a id="subcommands"><h1>Subcommands</h1></a>
-
-`cargo-shuttle`'s subcommands help you build and deploy web apps from start to finish.
-
-Run `cargo shuttle help` to see the basic usage:
-
-```text
-Usage: cargo-shuttle [OPTIONS] <COMMAND>
-
-Commands:
-  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
-  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 and man page
-  feedback    Open an issue on GitHub and provide feedback
-  help        Print this message or the help of the given subcommand(s)
-
-Options:
-      --working-directory <WORKING_DIRECTORY>  Specify the working directory [default: .] [aliases: wd]
-      --name <NAME>                            Specify the name of the project (overrides crate name)
-      --api-url <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
-```
-
-### Subcommand: `init`
-
-To initialize a shuttle project with boilerplates, run `cargo shuttle init [OPTIONS] [PATH]`.
-
-Currently, `cargo shuttle init` supports the following frameworks:
-
-- `--template actix-web`: for [actix web](https://actix.rs/) framework
-- `--template axum`: for [axum](https://github.com/tokio-rs/axum) framework
-- `--template loco`: for [loco](https://github.com/loco-rs/loco) 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 --template rocket my-rocket-app
-```
-
-This should generate the following dependency in `Cargo.toml`:
-
-```toml
-rocket = "0.5.0"
-shuttle-rocket = "0.39.0"
-shuttle-runtime = "0.39.0"
-tokio = "1.26.0"
-```
-
-The following boilerplate code should be generated into `src/lib.rs`:
-
-```rust
-#[macro_use]
-extern crate rocket;
-
-#[get("/")]
-fn index() -> &'static str {
-    "Hello, world!"
-}
-
-#[shuttle_runtime::main]
-async fn rocket() -> shuttle_rocket::ShuttleRocket {
-    let rocket = rocket::build().mount("/", routes![index]);
+Windows (powershell):
 
-    Ok(rocket.into())
-}
+```powershell
+iwr https://www.shuttle.rs/install-win | iex
 ```
 
-### Subcommand: `run`
+Build from source:
 
-To run the shuttle project locally, use the following command:
-
-```sh
-# Inside your shuttle project
-cargo shuttle run
-```
-
-This will compile your shuttle project and start it on the default port `8000`. Test it by:
-
-```sh
-$ curl http://localhost:8000
-Hello, world!
-```
-
-### Subcommand: `login`
-
-Use `cargo shuttle login` inside your shuttle project to generate an API key for the shuttle platform:
-
-```sh
-# Inside a shuttle project
-cargo shuttle login
-```
-
-This should automatically open a browser window with an auto-generated API key for your project. Simply copy-paste the API key back in your terminal or run the following command to complete login:
-
-```sh
-cargo shuttle login --api-key <your-api-key-from-browser>
-```
-
-### Subcommand: `deploy`
-
-To deploy your shuttle project to the cloud, run:
-
-```sh
-cargo shuttle project start
-cargo shuttle deploy
-```
-
-Your service will immediately be available at `{crate_name}.shuttleapp.rs`. For instance:
-
-```sh
-$ curl https://my-rocket-app.shuttleapp.rs
-Hello, world!
-```
-
-### Subcommand: `status`
-
-Check the status of your deployed shuttle project with:
-
-```sh
-cargo shuttle status
-```
-
-### Subcommand: `logs`
-
-Check the logs of your deployed shuttle project with:
-
-```sh
-cargo shuttle logs
+```bash
+cargo install cargo-shuttle
 ```
 
-### Subcommand: `stop`
-
-Once you are done with a deployment, you can stop it by running:
+## Documentation
 
-```sh
-cargo shuttle stop
-```
+Run `cargo shuttle help` to see the basic usage.
 
----
+Full list of commands and more documentation can be viewed on the [CLI docs](https://docs.shuttle.rs/getting-started/shuttle-commands).
 
-<!-- markdownlint-disable-next-line -->
-<a id="development"><h1>Development</h1></a>
+## Development
 
 Thanks for using `cargo-shuttle`! We’re very happy to have you with us!
 

cargo-shuttle/README.md

@@ -41,7 +41,7 @@ pub struct ShuttleArgs {
 #[derive(Parser, Debug)]
 pub struct ProjectArgs {
     /// Specify the working directory
-    #[arg(global = true, long, visible_alias = "wd", default_value = ".", value_parser = OsStringValueParser::new().try_map(parse_init_path))]
+    #[arg(global = true, long, visible_alias = "wd", default_value = ".", value_parser = OsStringValueParser::new().try_map(parse_path))]
     pub working_directory: PathBuf,
     /// Specify the name of the project (overrides crate name)
     #[arg(global = true, long)]
@@ -295,7 +295,7 @@ pub struct InitArgs {
     pub subfolder: Option<String>,
 
     /// Path where to place the new Shuttle project
-    #[arg(default_value = ".", value_parser = OsStringValueParser::new().try_map(parse_init_path))]
+    #[arg(default_value = ".", value_parser = OsStringValueParser::new().try_map(create_and_parse_path))]
     pub path: PathBuf,
 
     /// Don't check the project name's validity or availability and use it anyways
@@ -393,12 +393,17 @@ impl InitTemplateArg {
 }
 
 /// Helper function to parse and return the absolute path
-fn parse_path(path: OsString) -> Result<PathBuf, String> {
-    dunce::canonicalize(&path).map_err(|e| format!("could not turn {path:?} into a real path: {e}"))
+fn parse_path(path: OsString) -> Result<PathBuf, io::Error> {
+    dunce::canonicalize(&path).map_err(|e| {
+        io::Error::new(
+            ErrorKind::InvalidInput,
+            format!("could not turn {path:?} into a real path: {e}"),
+        )
+    })
 }
 
 /// Helper function to parse, create if not exists, and return the absolute path
-pub(crate) fn parse_init_path(path: OsString) -> Result<PathBuf, io::Error> {
+pub(crate) fn create_and_parse_path(path: OsString) -> Result<PathBuf, io::Error> {
     // Create the directory if does not exist
     create_dir_all(&path).map_err(|e| {
         io::Error::new(
@@ -407,7 +412,7 @@ pub(crate) fn parse_init_path(path: OsString) -> Result<PathBuf, io::Error> {
         )
     })?;
 
-    parse_path(path).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e))
+    parse_path(path)
 }
 
 #[cfg(test)]

cargo-shuttle/src/args.rs

@@ -408,7 +408,7 @@ impl Shuttle {
                 .interact()?;
             println!();
 
-            let path = args::parse_init_path(OsString::from(directory_str))?;
+            let path = args::create_and_parse_path(OsString::from(directory_str))?;
 
             if std::fs::read_dir(&path)
                 .expect("init dir to exist and list entries")

cargo-shuttle/src/lib.rs

@@ -8,7 +8,11 @@ publish = false
 
 [dependencies]
 cargo-shuttle = { path = "../cargo-shuttle" }
-shuttle-proto = { workspace = true, features = ["logger", "resource-recorder"] }
+shuttle-proto = { workspace = true, features = [
+    "logger-client",
+    "resource-recorder-client",
+    "provisioner-client",
+] }
 
 hyper = { workspace = true }
 portpicker = { workspace = true }

common-tests/Cargo.toml

@@ -45,7 +45,6 @@ tonic = { workspace = true, optional = true }
 tower = { workspace = true, optional = true }
 tower-http = { workspace = true, optional = true }
 tracing = { workspace = true, features = ["std"], optional = true }
-tracing-core = { workspace = true, optional = true }
 tracing-opentelemetry = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }
 ttl_cache = { workspace = true, optional = true }
@@ -72,7 +71,7 @@ backend = [
     "tower-http",
     "tracing-subscriber/env-filter",
     "tracing-subscriber/fmt",
-    "tracing-core",
+    "tracing",
     "ttl_cache",
 ]
 claims = [
@@ -90,6 +89,14 @@ claims = [
     "tracing-opentelemetry",
 ]
 display = ["chrono/clock", "comfy-table", "crossterm"]
+extract_propagation = [
+    "http",
+    "opentelemetry",
+    "opentelemetry-http",
+    "pin-project",
+    "tower",
+    "tracing-opentelemetry",
+]
 models = ["async-trait", "http", "reqwest", "service", "thiserror"]
 persist = ["sqlx", "rand"]
 sqlx = ["dep:sqlx", "sqlx/sqlite"]