further cleanup

Cargo.lock

@@ -415,7 +415,6 @@ dependencies = [
  "anyhow",
  "chrono",
  "config",
- "container_common",
  "dotenv",
  "easyenv",
  "enums",
@@ -869,8 +868,8 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "chrono",
- "container_common",
  "dotenv",
+ "errors",
  "http_server_common",
  "log",
  "mockall",
@@ -1757,9 +1756,9 @@ name = "db-backup"
 version = "0.0.1"
 dependencies = [
  "anyhow",
- "container_common",
  "dotenv",
  "easyenv",
+ "errors",
  "log",
  "my-workspace-hack",
  "serde",
@@ -1772,7 +1771,6 @@ version = "0.0.1"
 dependencies = [
  "buckets",
  "clap",
- "container_common",
  "dotenv",
  "easyenv",
  "enums",
@@ -2355,7 +2353,6 @@ dependencies = [
  "bootstrap",
  "chrono",
  "config",
- "container_common",
  "dotenv",
  "easyenv",
  "elasticsearch",
@@ -3616,7 +3613,6 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "chrono",
- "container_common",
  "errors",
  "log",
  "my-workspace-hack",

crates/cli/production/db-backup/Cargo.toml

@@ -16,10 +16,9 @@ path = "src/main.rs"
 normal = ["my-workspace-hack"]
 
 [dependencies]
-
 # Internal
-container_common = { path = "../../../lib/deprecated/container_common" }
 easyenv = { path = "../../../lib/easyenv" }
+errors = { path = "../../../lib/errors" }
 
 # Workspace hack (faster compile times)
 my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

crates/cli/production/db-backup/src/main.rs

@@ -1,7 +1,7 @@
 use log::info;
 
-use container_common::anyhow_result::AnyhowResult;
 use easyenv::init_all_with_default_logging;
+use errors::AnyhowResult;
 
 fn main() -> AnyhowResult<()> {
     init_all_with_default_logging(None);

crates/cli/production/db-cleanup/Cargo.toml

@@ -18,7 +18,6 @@ normal = ["my-workspace-hack"]
 [dependencies]
 # Internal
 buckets = { path = "../../../_types/buckets" }
-container_common = { path = "../../../lib/deprecated/container_common" }
 easyenv = { path = "../../../lib/easyenv" }
 enums = { path = "../../../_types/enums" }
 errors = { path = "../../../lib/errors" }

crates/cli/production/db-cleanup/src/main.rs

@@ -2,8 +2,8 @@ use log::info;
 use sqlx::{MySql, Pool};
 use sqlx::mysql::MySqlPoolOptions;
 
-use container_common::anyhow_result::AnyhowResult;
 use easyenv::init_all_with_default_logging;
+use errors::AnyhowResult;
 
 use crate::cli_args::Action;
 use crate::operations::delete_all_anonymous_user_images::delete_all_anonymous_user_images::delete_all_anonymous_user_images;

crates/lib/jobs_common/Cargo.toml

@@ -21,7 +21,6 @@ normal = ["my-workspace-hack"]
 [dependencies]
 
 # Internal
-container_common = { path = "../deprecated/container_common" }
 errors = { path = "../errors" }
 redis_common = { path = "../redis_common" }
 

crates/lib/jobs_common/src/job_progress_reporter/job_progress_reporter.rs

@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub trait JobProgressReporterBuilder {
   // NB: Still learning "Box<dyn Trait>" vs "impl Trait";

crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs

@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 use crate::job_progress_reporter::job_progress_reporter::{JobProgressReporter, JobProgressReporterBuilder};
 

crates/lib/jobs_common/src/job_progress_reporter/redis_job_progress_reporter.rs

@@ -2,7 +2,7 @@ use r2d2_redis::{r2d2, RedisConnectionManager};
 use r2d2_redis::r2d2::PooledConnection;
 use r2d2_redis::redis::Commands;
 
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use redis_common::redis_keys::RedisKeys;
 
 use crate::job_progress_reporter::job_progress_reporter::{JobProgressReporter, JobProgressReporterBuilder};

crates/lib/jobs_common/src/redis_job_status_logger.rs

@@ -2,7 +2,7 @@ use r2d2_redis::r2d2::PooledConnection;
 use r2d2_redis::redis::Commands;
 use r2d2_redis::RedisConnectionManager;
 
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use redis_common::redis_keys::RedisKeys;
 
 #[deprecated(note="Use JobProgressReporterBuilder")]

crates/lib/jobs_common/src/semi_persistent_cache_dir.rs

@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 /// These are for files on the worker filesystems
 pub struct SemiPersistentCacheDir {

crates/service/job/analytics_job/Cargo.toml

@@ -19,7 +19,6 @@ normal = ["my-workspace-hack"]
 
 # Internal
 config = { path = "../../../lib/deprecated/config" }
-container_common = { path = "../../../lib/deprecated/container_common" }
 easyenv = { path = "../../../lib/easyenv" }
 enums = { path = "../../../_types/enums" }
 errors = { path = "../../../lib/errors" }

crates/service/job/es-update-job/Cargo.toml

@@ -20,7 +20,6 @@ normal = ["my-workspace-hack"]
 # Internal
 bootstrap = { path = "../../../lib/bootstrap" }
 config = { path = "../../../lib/deprecated/config" }
-container_common = { path = "../../../lib/deprecated/container_common" }
 easyenv = { path = "../../../lib/easyenv" }
 elasticsearch_schema = { path = "../../../lib/elasticsearch_schema" }
 enums = { path = "../../../_types/enums" }

crates/service/plugins/billing/Cargo.toml

@@ -18,7 +18,7 @@ normal = ["my-workspace-hack"]
 [dependencies]
 
 # Internal
-container_common = { path = "../../../lib/deprecated/container_common" }
+errors = { path = "../../../lib/errors" }
 http_server_common = { path = "../../../lib/deprecated/http_server_common" }
 mysql_queries = { path = "../../../lib/mysql_queries" }
 reusable_types = { path = "../../../_types/reusable_types" }

crates/service/plugins/billing/src/stripe/helpers/verify_stripe_webhook_ip_address.rs

@@ -3,8 +3,8 @@ use std::collections::HashSet;
 use actix_web::HttpRequest;
 use anyhow::anyhow;
 use once_cell::sync::Lazy;
+use errors::AnyhowResult;
 
-use container_common::anyhow_result::AnyhowResult;
 use http_server_common::request::get_request_ip::get_request_ip;
 
 /// List of IP addresses that send webhook requests

crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs

@@ -3,7 +3,7 @@ use chrono::NaiveDateTime;
 use log::error;
 use stripe::{Subscription, SubscriptionStatus};
 
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
 

crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs

@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
 use log::error;
 use stripe::{Invoice, InvoiceLineItemType, InvoiceStatus, SubscriptionInterval};
 
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
@@ -157,8 +157,7 @@ fn invoice_paid_extractor(invoice: &Invoice) -> AnyhowResult<Option<InvoicePaidD
 mod tests {
   use anyhow::bail;
   use stripe::Invoice;
-
-  use container_common::anyhow_result::AnyhowResult;
+  use errors::AnyhowResult;
 
   use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_extractor;
   use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::InvoicePaidDetails;