update dependencies; cleanup code; remove docker

Author: JesusGuzmanJr

.vscode/settings.json

@@ -17,6 +17,7 @@
         "footguns",
         "hasher",
         "initializer",
+        "javac",
         "jdks",
         "libexec",
         "musl",

README.md

@@ -16,28 +16,25 @@ Rust earned the top spot as the “most-loved” programming language for the fi
 
 ### Stack Comparison
 
-| Stack              | Java                                                   | Rust                                         |
-| ------------------ | ------------------------------------------------------ | -------------------------------------------- |
-| domain name        | java-car-rentals.marzipan.club                         | rust-car-rentals.marzipan.club               |
-| health endpoint    | https://java-car-rentals.marzipan.club/health          | https://rust-car-rental.marzipan.club/health |
-| language           | [Java SE 8] ([OpenJDK 8 8u292-b10])                    | [Rust 2018] ([1.54.0])                       |
-| compiler           | java-1.8.0-openjdk-devel                               | rustc 1.54.0 (a178d0322 2021-07-26)          |
-| compilation target | java bytecode 52.0                                     | x86_64-unknown-linux-musl                    |
-| runtime            | [OpenJDK] ([java-1.8.0-openjdk])                       | [Tokio] ([0.2.25])                           |
-| web framework      | [Apache Tomcat] ([8.5.69]) and [Spring Boot] ([2.5.2]) | [Actix Web] ([3.3.2])                        |
-| package manager    | mvn                                                    | cargo                                        |
-| manifest file      | pom.xml                                                | cargo.toml                                   |
-| operating system   | Fedora 34                                              | Fedora 34                                    |
-| cpu                | 2  vCPU (AMD EPYC 2nd Gen)                             | 2  vCPU (AMD EPYC 2nd Gen)                   |
-| memory             | 2 GB                                                   | 2 GB                                         |
-| disk space         | 40 GB                                                  | 40 GB                                        |
+| Stack              | Java                                                   | Rust                                |
+| ------------------ | ------------------------------------------------------ | ----------------------------------- |
+| domain name        | java.marzipan.club                                     | rust.marzipan.club                  |
+| health endpoint    | https://java.marzipan.club/health                      | https://rust.marzipan.club/health   |
+| language           | [Java SE 8] ([OpenJDK 8 8u292-b10])                    | [Rust 2018] ([1.54.0])              |
+| compiler           | javac 1.8.0_302                                        | rustc 1.54.0 (a178d0322 2021-07-26) |
+| target             | java bytecode 52.0                                     | stable-x86_64-unknown-linux-gnu     |
+| runtime            | [OpenJDK] ([java-1.8.0-openjdk])                       | [Tokio] ([0.2.25])                  |
+| web framework      | [Apache Tomcat] ([8.5.69]) and [Spring Boot] ([2.5.2]) | [Actix Web] ([3.3.2])               |
+| package manager    | mvn                                                    | cargo                               |
+| manifest file      | [pom.xml]                                              | [cargo.toml]                        |
+| configuration file | [application.properties]                               | [config.ron]                        |
 
 
 [Java SE 8]: https://docs.oracle.com/javase/8
 [OpenJDK 8 8u292-b10]: https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-April/013680.html
 
 [Rust 2018]: https://www.rust-lang.org
-[1.53.0]: https://blog.rust-lang.org/2021/06/17/Rust-1.53.0.html
+[1.54.0]: https://blog.rust-lang.org/2021/07/29/Rust-1.54.0.html
 
 [OpenJDK]: https://openjdk.java.net
 [java-1.8.0-openjdk]: https://openjdk.java.net/install
@@ -54,4 +51,18 @@ Rust earned the top spot as the “most-loved” programming language for the fi
 [Actix Web]: https://actix.rs
 [3.3.2]: https://crates.io/crates/actix-web/3.3.2
 
+[pom.xml]: java/pom.xml
+[cargo.toml]: rust/cargo.toml
+
+[application.properties]: java/src/main/resources/application.properties
+[config.ron]: rust/config.ron
+
+
+| Server Specs per Stack |                                  |
+| ---------------------- | -------------------------------- |
+| operating system       | Fedora 34                        |
+| cpu                    | 2  vCPU cores (AMD EPYC 2nd Gen) |
+| memory                 | 2 GB RAM                         |
+| disk space             | 40 GB NVMe                       |
+| cost                   | $50 per year                     |
 ---

sql/README.md renamed to database/README.md

@@ -35,6 +35,7 @@ Install the package manager.
 Install the web server.
 
     brew install tomcat
+
 ## Development
 Run the program.
 
@@ -55,11 +56,3 @@ Make a production build.
 Clear build artifacts.
 
     mvn clean
-
-Make a production build image.
-
-    docker build -t java-car-rentals:latest
-
-Run an ephemeral docker container.
-
-    docker run --rm -it java-car-rentals:latest

sql/migrations/20210724052611_create_account_table.down.sql renamed to database/migrations/20210724052611_create_account_table.down.sql

@@ -17,5 +17,12 @@ spring.datasource.hikari.maxLifetime=600
 spring.datasource.hikari.idleTimeout=3000
 spring.datasource.data-source-class-name=org.postgresql.ds.PGSimpleDataSource
 
+# tls
+server.ssl.enabled-protocols=TLSv1.3
+server.ssl.enabled=true
+server.ssl.key-store-type=PKCS12
+server.ssl.key-store=classpath:keystore/keystore.p12
+server.ssl.key-store-password=changeit
+
 # miscellaneous
 management.info.git.mode=full

sql/migrations/20210724052611_create_account_table.up.sql renamed to database/migrations/20210724052611_create_account_table.up.sql

@@ -1,4 +1,4 @@
-package club.marzipan.carrentals;
+package club.marzipan.javacarrentals;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

java/Dockerfile

@@ -8,19 +8,19 @@ version = "0.1.0"
 
 [dependencies]
 actix-web = {version = "3.3.2", features = ["rustls"]}
-argon2 = "0.2.2"
+argon2 = "0.2.3"
 base64 = "0.13.0"
 base64-serde = "0.6.1"
 chrono = {version = "0.4.19", features = ["serde"]}
-color-backtrace = "0.5.0"
+color-backtrace = "0.5.1"
 derive_more = "0.99.16"
 env_logger = "0.9.0"
 log = "0.4.14"
 once_cell = "1.8.0"
 rand_core = "0.6.3"
 ron = "0.6.4"
-serde = "1.0.126"
-serde_json = "1.0.64"
+serde = "1.0.127"
+serde_json = "1.0.66"
 sqlx = {version = "0.5.5", features = [
   "runtime-async-std-rustls",
   "macros",

java/README.md

@@ -33,7 +33,6 @@ Install the linter `clippy`.
 
     rustup component add clippy
 
-- Install docker: https://docs.docker.com/docker-for-mac/install/
 
 ## Development
 Automatically build and run on source changes.
@@ -59,11 +58,3 @@ Clear build artifacts.
 Check for outdated dependencies.
 
     cargo outdated
-
-Make a production build image.
-
-    docker build -t rust-car-rentals:latest
-
-Run an ephemeral docker container.
-
-    docker run --rm -it rust-car-rentals:latest

java/src/main/resources/application.properties

@@ -7,8 +7,12 @@ use uuid::Uuid;
 use validator::Validate;
 
 use crate::{
-    account::Account, account_entity, account_entity::AccountEntity, account_repository,
-    create_account::CreateAccount, error_handler::Error, password_hasher,
+    account::Account,
+    account_entity::{AccountEntity, Status::Unverified},
+    account_repository,
+    create_account::CreateAccount,
+    error_handler::Error,
+    password_hasher,
 };
 
 #[get("/account/{id}")]
@@ -36,7 +40,7 @@ async fn create_account(Json(create_account): Json<CreateAccount>) -> Result<Htt
         email: create_account.email,
         password_hash: password_hash.into(),
         password_salt: password_salt.into(),
-        status: account_entity::Status::Unverified,
+        status: Unverified,
     };
 
     account_repository::save_and_flush(&account_entity).await?;

java/src/test/java/club/marzipan/carrentals/CarRentalsApplicationTests.java renamed to java/src/test/java/club/marzipan/javacarrentals/CarRentalsApplicationTests.java

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use once_cell::sync::OnceCell;
 
 type Pool = sqlx::Pool<sqlx::Postgres>;
@@ -7,8 +9,8 @@ static POOL: OnceCell<Pool> = OnceCell::new();
 pub async fn init() {
     let config = crate::config::app_config();
 
-    let connection_timeout = std::time::Duration::new(config.postgres_timeout_sec, 0);
-    let max_lifetime = std::time::Duration::new(config.postgres_max_life_time_minutes * 60, 0);
+    let connection_timeout = Duration::new(config.postgres_timeout_sec, 0);
+    let max_lifetime = Duration::new(config.postgres_max_life_time_minutes * 60, 0);
 
     // panic if connection pool can't be created
     let pool = sqlx::postgres::PgPoolOptions::new()