Docker works now, it didn't before because im stupid

Author: averwhy

Dockerfile

@@ -1,10 +1,15 @@
 FROM rust:latest AS builder 
-WORKDIR /home/bot
+WORKDIR /bot
 
-COPY . .
+COPY Cargo.toml .
+COPY Cargo.lock .
+COPY .sqlx ./.sqlx
+COPY src ./src
 RUN cargo build --release
 
 FROM debian:bookworm
+RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
 WORKDIR /bot
-COPY --from=builder /home/bot/target/release/Trackr .
-CMD ["sudo ./Trackr"]
+COPY config.json .
+COPY --from=builder /bot/target/release/Trackr .
+CMD ["./Trackr"]

src/commands.rs

@@ -3,8 +3,6 @@ const VERSION: &str = env!("CARGO_PKG_VERSION");
 #[allow(dead_code)]
 const DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION");
 
-use crate::utils::agencies::get as get_agency;
-
 /// Show this help menu
 #[poise::command(prefix_command, track_edits, slash_command, category = "Misc")]
 pub async fn help(
@@ -70,34 +68,4 @@ pub async fn support(ctx: Context<'_>) -> Result<(), Error> {
     )
     .await?;
     Ok(())
-}
-
-/// Track a transit agency
-#[poise::command(prefix_command, track_edits, slash_command, category = "Tracking")]
-pub async fn track(
-    ctx: Context<'_>,
-    #[description = "The name of the transit agency to check the status of"] agency_name: String,
-) -> Result<(), Error> {
-    let agency_name_upper = agency_name.to_uppercase();
-    let Some(agency) = get_agency(agency_name_upper) else {
-        poise::send_reply(
-            ctx,
-            poise::CreateReply::default()
-                .ephemeral(false)
-                .content(format!("Could not find agency `{}`", agency_name)),
-        )
-        .await?;
-        return Ok(());
-    };
-    poise::send_reply(
-        ctx,
-        poise::CreateReply::default()
-            .ephemeral(false)
-            .content(format!(
-                "Pretending to track {}\nVisit them at {}",
-                agency.name, agency.url
-            )),
-    )
-    .await?;
-    Ok(())
-}
+}

src/dev_commands.rs

@@ -1,6 +1,8 @@
 use crate::{Context, Error};
-use sqlx;
 use poise::CreateReply;
+use sqlx::{self, query};
+use tracing_subscriber::fmt::format;
+use sqlx::Row;
 
 /// Top level command for development commands. Owner only
 #[poise::command(
@@ -43,14 +45,25 @@ pub async fn stop(ctx: Context<'_>) -> Result<(), Error> {
     hide_in_help,
     category = "Dev"
 )]
-pub async fn sql(ctx: Context<'_>, query: String) -> Result<(), Error> {
-    sqlx::query(
-        query.as_str()
-    )
-    .execute(&ctx.data().db.pool)
-    .await
-    .map_err(|e| format!("Query execution failed: {}", e))?;
-
+pub async fn sql(ctx: Context<'_>, #[rest] query: String) -> Result<(), Error> {
+    let result = "";
+    // todo for this: write structs for all db tables
+    if query.to_uppercase().contains("SELECT"){
+        let r = sqlx::query(
+            query.as_str()
+        )
+        .fetch_one(&ctx.data().db.pool)
+        .await
+        .map_err(|e| format!("Query execution failed: {}", e))?;
+    } else {
+        sqlx::query(
+            query.as_str()
+        )
+        .execute(&ctx.data().db.pool)
+        .await
+        .map_err(|e| format!("Query execution failed: {}", e))?;
+    }
+    poise::send_reply(ctx, poise::CreateReply::default().content(result)).await?;
     Ok(())
 }
 

src/main.rs

@@ -49,12 +49,11 @@ async fn main() {
         // this is a list of all commands from the commands.rs file
         commands: vec![
             commands::help(), // Public commands \/
-            commands::track(),
             commands::about(),
             commands::support(),
             dev_commands::dev(), // Dev commands \/
             dev_commands::track(),
-        ], // dev only commands (subcommands are NOT included because then they would be runnable on their own)
+        ],
         prefix_options: poise::PrefixFrameworkOptions {
             prefix: Some(config.prefix.clone()),
             // tracks messages that are edited within the last hour
@@ -106,7 +105,7 @@ async fn main() {
                 println!("Logged in as {}", _ready.user.name);
                 poise::builtins::register_globally(ctx, &framework.options().commands).await?;
                 Ok(Data {
-                    db: Client::new().await?,
+                    db: Client::new().await.expect("Failed to connect to database"),
                     config,
                 })
             })

src/utils/database.rs

@@ -10,7 +10,7 @@ pub struct Client {
 impl Client {
     pub async fn new() -> Result<Self, sqlx::Error> {
         let secrets = get_secrets();
-        let pool = PgPool::connect(&secrets.database_url).await?;
+        let pool = PgPool::connect(&secrets.database_url).await.expect("Could not connect to PostgreSQL. Check the database URL");
         Ok(Self { pool })
     }
 
@@ -34,7 +34,7 @@ impl Client {
         )
         .fetch_one(&self.pool)
         .await?;
-
+        
         Ok(user.id)
     }
 }

src/utils/db/schema.sql

@@ -29,7 +29,9 @@ CREATE TABLE agencies (
     short_name VARCHAR(50) NOT NULL,
     long_name VARCHAR(100) NOT NULL,
     api_url TEXT NOT NULL,
+    key_required BOOLEAN DEFAULT TRUE,
     key_env_name VARCHAR(100) NOT NULL,
+    auth_header_name VARCHAR(100) NOT NULL,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );

src/utils/secrets.rs

@@ -10,6 +10,7 @@ pub struct Secrets {
     pub mbta_api_key: String,
 }
 pub fn get() -> Secrets {
-    let file = File::open("secrets.json").expect("file should open read only"); // TODO: convert to env because docker
-    return serde_json::from_reader(file).expect("file should be proper JSON");
+    let secrets_path: String  = std::env::var("SECRETS").expect("No SECRETS environment variable declared");
+    let file = File::open(secrets_path).expect("Secrets file, as declared by the SECRETS environment variable, was not found");
+    return serde_json::from_reader(file).expect("Secrets file should be proper JSON");
 }