fix: more removals of shuttle-secrets

axum/oauth2/Cargo.toml

@@ -13,7 +13,6 @@ reqwest = { version = "0.11.18", features = ["json"] }
 serde = { version = "1.0.183", features = ["derive"] }
 shuttle-axum = "0.42.0"
 shuttle-runtime = "0.42.0"
-shuttle-secrets = "0.42.0"
 shuttle-shared-db = { version = "0.42.0", features = ["postgres", "sqlx"] }
 sqlx = { version = "0.7.2", features = ["runtime-tokio-rustls", "macros", "chrono"] }
 thiserror = "1.0.57"

axum/oauth2/src/main.rs

@@ -3,7 +3,7 @@ use axum_extra::extract::cookie::Key;
 use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
 use reqwest::Client;
 use routes::oauth;
-use shuttle_secrets::SecretStore;
+use shuttle_runtime::SecretStore;
 use sqlx::PgPool;
 pub mod routes;
 
@@ -24,7 +24,7 @@ impl FromRef<AppState> for Key {
 #[shuttle_runtime::main]
 async fn axum(
     #[shuttle_shared_db::Postgres] db: PgPool,
-    #[shuttle_secrets::Secrets] secrets: SecretStore,
+    #[shuttle_runtime::Secrets] secrets: SecretStore,
 ) -> shuttle_axum::ShuttleAxum {
     sqlx::migrate!()
         .run(&db)

other/standalone-binary/README.md

@@ -7,4 +7,4 @@ All startup logic is placed in the binary source files, while the implementation
 - `src/bin/shuttle.rs` is the main binary with Shuttle, run with `cargo shuttle run`. Note that the `[[bin]]` entry in `Cargo.toml` needs to have the same name as the crate. The file can have any name you want.
 - `src/bin/standalone.rs` is without Shuttle, run with `cargo run --bin standalone` (you can change the name)
 
-This example shows how to use separate logic for getting secrets (`shuttle-secrets` vs homemade solution), but the same approach can be applied to other resources that are initiated by Shuttle's main function.
+This example shows how to use separate logic for getting secrets (Shuttle secrets vs homemade solution), but the same approach can be applied to other resources that are initiated by Shuttle's main function.

rocket/secrets/src/main.rs

@@ -16,9 +16,7 @@ struct MyState {
 }
 
 #[shuttle_runtime::main]
-async fn rocket(
-    #[shuttle_runtime::Secrets] secrets: SecretStore,
-) -> shuttle_rocket::ShuttleRocket {
+async fn rocket(#[shuttle_runtime::Secrets] secrets: SecretStore) -> shuttle_rocket::ShuttleRocket {
     // get secret defined in `Secrets.toml` file.
     let secret = secrets.get("MY_API_KEY").context("secret was not found")?;
 

serenity/weather-forecast/Cargo.toml

@@ -9,7 +9,6 @@ reqwest = { version = "0.11.24", features = ["json"] }
 serde = "1.0.197"
 serenity = { version = "0.12.0", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
 shuttle-runtime = "0.42.0"
-shuttle-secrets = "0.42.0"
 shuttle-serenity = "0.42.0"
 tokio = "1.26.0"
 tracing = "0.1.37"

serenity/weather-forecast/src/main.rs

@@ -8,7 +8,7 @@ use serenity::builder::{
 };
 use serenity::model::gateway::Ready;
 use serenity::prelude::*;
-use shuttle_secrets::SecretStore;
+use shuttle_runtime::SecretStore;
 use tracing::info;
 
 struct Bot {
@@ -87,7 +87,7 @@ impl EventHandler for Bot {
 
 #[shuttle_runtime::main]
 async fn serenity(
-    #[shuttle_secrets::Secrets] secret_store: SecretStore,
+    #[shuttle_runtime::Secrets] secret_store: SecretStore,
 ) -> shuttle_serenity::ShuttleSerenity {
     // Get the discord token set in `Secrets.toml`
     let discord_token = secret_store

templates.toml

@@ -315,7 +315,7 @@ tags = ["actix-web", "tracing"]
 
 [examples.metadata]
 title = "Shuttle Metadata"
-description = "Basic usage of shuttle-metadata"
+description = "Basic usage of Shuttle Metadata"
 path = "axum/metadata"
 use_cases = []
 tags = ["axum"]
@@ -329,7 +329,7 @@ tags = ["rocket"]
 
 [examples.secrets]
 title = "Shuttle Secrets"
-description = "Basic usage of shuttle-secrets"
+description = "Basic usage of Shuttle Secrets"
 path = "rocket/secrets"
 use_cases = ["Web app"]
 tags = ["rocket"]