bug: Isolate dynamodb to feature flag only (#612)

Closes: SYNC-4097
mozilla-services · Feb 13, 2024 · 158e01c · 158e01c
1 parent f44b3a7
commit 158e01c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/autopush-common/Cargo.toml b/autopush-common/Cargo.toml
@@ -3,6 +3,7 @@ name = "autopush_common"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+build = "build.rs"
 
 [lib]
 name = "autopush_common"

diff --git a/autopush-common/build.rs b/autopush-common/build.rs
@@ -0,0 +1,5 @@
+pub fn main() {
+    if !(cfg!(feature = "dynamodb") || cfg!(feature = "bigtable")) {
+        panic!("No database defined! Please compile with either `features=dynamodb` or `features=bigtable`");
+    }
+}
diff --git a/autopush-common/src/db/error.rs b/autopush-common/src/db/error.rs
@@ -1,5 +1,7 @@
 use backtrace::Backtrace;
+#[cfg(feature = "dynamodb")]
 use rusoto_core::RusotoError;
+#[cfg(feature = "dynamodb")]
 use rusoto_dynamodb::{
     BatchWriteItemError, DeleteItemError, DescribeTableError, GetItemError, PutItemError,
     QueryError, UpdateItemError,
@@ -14,27 +16,35 @@ pub type DbResult<T> = Result<T, DbError>;
 
 #[derive(Debug, Error)]
 pub enum DbError {
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing GetItem")]
     DdbGetItem(#[from] RusotoError<GetItemError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing UpdateItem")]
     DdbUpdateItem(#[from] RusotoError<UpdateItemError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing PutItem")]
     DdbPutItem(#[from] RusotoError<PutItemError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing DeleteItem")]
     DdbDeleteItem(#[from] RusotoError<DeleteItemError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing BatchWriteItem")]
     DdbBatchWriteItem(#[from] RusotoError<BatchWriteItemError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing DescribeTable")]
     DdbDescribeTable(#[from] RusotoError<DescribeTableError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Database error while performing Query")]
     DdbQuery(#[from] RusotoError<QueryError>),
 
+    #[cfg(feature = "dynamodb")]
     #[error("Error while performing DynamoDB (de)serialization: {0}")]
     DdbSerialization(#[from] serde_dynamodb::Error),
 

diff --git a/autopush-common/src/db/mod.rs b/autopush-common/src/db/mod.rs
@@ -18,7 +18,9 @@ use serde::Serializer;
 use serde_derive::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::db::{dynamodb::has_connected_this_month, util::generate_last_connect};
+#[cfg(feature = "dynamodb")]
+use crate::db::dynamodb::has_connected_this_month;
+use util::generate_last_connect;
 
 #[cfg(feature = "bigtable")]
 pub mod bigtable;
@@ -59,6 +61,20 @@ pub enum StorageType {
     // Postgres,
 }
 
+impl From<&str> for StorageType {
+    fn from(name: &str) -> Self {
+        match name.to_lowercase().as_str() {
+            #[cfg(feature = "bigtable")]
+            "bigtable" => Self::BigTable,
+            #[cfg(feature = "dual")]
+            "dual" => Self::Dual,
+            #[cfg(feature = "dynamodb")]
+            "dynamodb" => Self::DynamoDb,
+            _ => Self::INVALID,
+        }
+    }
+}
+
 /// The type of storage to use.
 #[allow(clippy::vec_init_then_push)] // Because we are only pushing on feature flags.
 impl StorageType {
@@ -78,8 +94,9 @@ impl StorageType {
         debug!("Supported data types: {:?}", StorageType::available());
         debug!("Checking DSN: {:?}", &dsn);
         if dsn.is_none() {
-            info!("No DSN specified, failing over to old default dsn");
-            return Self::DynamoDb;
+            let default = Self::available()[0];
+            info!("No DSN specified, failing over to old default dsn: {default}");
+            return Self::from(default);
         }
         let dsn = dsn
             .clone()
@@ -207,6 +224,7 @@ impl Default for User {
 }
 
 impl User {
+    #[cfg(feature = "dynamodb")]
     pub fn set_last_connect(&mut self) {
         self.last_connect = if has_connected_this_month(self) {
             None