Migration to Shuttle

ken-matsui · Dec 15, 2023 · 6b54a83 · 6b54a83
1 parent 0730fc0
commit 6b54a83
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 73 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
diff --git a/.github/workflows/shuttle.yml b/.github/workflows/shuttle.yml
@@ -0,0 +1,15 @@
+name: Shuttle
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: shuttle-hq/deploy-action@main
+        with:
+          deploy-key: ${{ secrets.SHUTTLE_API_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -467,6 +467,7 @@ FodyWeavers.xsd
 
 .env*
 !.env.example
+Secrets.toml
 
 *.sql
 !migrations/**/*.sql

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ awc = {version = "3.2.0", features = ["openssl"]}
 base64 = "0.21.5"
 chrono = {version = "0.4", features = ["serde"]}
 diesel = {version = "2", features = ["postgres", "r2d2", "uuid", "serde_json", "chrono"]}
-dotenvy = "0.15"
 env_logger = "0.10"
 log = "0.4"
 poac_api_utils = {path = "./poac_api_utils"}

diff --git a/Dockerfile b/Dockerfile
diff --git a/.env.example → Secrets.example.toml b/.env.example → Secrets.example.toml
diff --git a/fly.toml b/fly.toml
diff --git a/src/main.rs b/src/main.rs
@@ -11,15 +11,22 @@ use std::env;
 use actix_web::{middleware::Logger, web, web::ServiceConfig};
 use diesel::r2d2::{ConnectionManager, Pool};
 use diesel::PgConnection;
-use dotenvy::dotenv;
 use shuttle_actix_web::ShuttleActixWeb;
+use shuttle_secrets::SecretStore;
 
 #[shuttle_runtime::main]
-async fn actix_web() -> ShuttleActixWeb<impl FnOnce(&mut ServiceConfig) + Send + Clone + 'static> {
-    dotenv().ok();
+async fn actix_web(
+    #[shuttle_secrets::Secrets] secret_store: SecretStore,
+) -> ShuttleActixWeb<impl FnOnce(&mut ServiceConfig) + Send + Clone + 'static> {
+    // Set up secrets
+    let database_url = secret_store.get("DATABASE_URL").expect("DATABASE_URL must be set");
+    let gh_oauth_client_id = secret_store.get("GITHUB_OAUTH_CLIENT_ID").expect("GITHUB_OAUTH_CLIENT_ID must be set");
+    let gh_oauth_client_secret = secret_store.get("GITHUB_OAUTH_CLIENT_SECRET").expect("GITHUB_OAUTH_CLIENT_SECRET must be set");
+
+    env::set_var("GITHUB_OAUTH_CLIENT_ID", gh_oauth_client_id);
+    env::set_var("GITHUB_OAUTH_CLIENT_SECRET", gh_oauth_client_secret);
 
     // Set up database connection pool
-    let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     let manager = ConnectionManager::<PgConnection>::new(database_url);
     let pool = Pool::builder()
         .build(manager)