Merge main to api-locking

crates/router/src/db/configs.rs

@@ -99,7 +99,7 @@ impl ConfigInterface for Store {
  .map_err(Into::into)
  .into_report()
  }
- 
+
  //check in cache, then redis then finally DB, and on the way back populate redis and cache
  async fn find_config_by_key(
  &self,
@@ -154,45 +154,6 @@ impl ConfigInterface for Store {
  cache::get_or_populate_in_memory(self, key, find_else_unwrap_or, &CONFIG_CACHE).await
  }
 
- async fn find_config_by_key_unwrap_or(
- &self,
- key: &str,
- // If the config is not found it will be created with the default value.
- default_config: Option<String>,
- ) -> CustomResult<storage::Config, errors::StorageError> {
- let find_else_unwrap_or = || async {
- let conn = connection::pg_connection_write(self).await?;
- match storage::Config::find_by_key(&conn, key)
- .await
- .map_err(Into::<errors::StorageError>::into)
- .into_report()
- {
- Ok(a) => Ok(a),
- Err(err) => {
- if err.current_context().is_db_not_found() {
- default_config
- .ok_or(err)
- .async_and_then(|c| async {
- storage::ConfigNew {
- key: key.to_string(),
- config: c,
- }
- .insert(&conn)
- .await
- .map_err(Into::into)
- .into_report()
- })
- .await
- } else {
- Err(err)
- }
- }
- }
- };
-
- cache::get_or_populate_in_memory(self, key, find_else_unwrap_or, &CONFIG_CACHE).await
- }
-
  async fn delete_config_by_key(&self, key: &str) -> CustomResult<bool, errors::StorageError> {
  let conn = connection::pg_connection_write(self).await?;
  let deleted = storage::Config::delete_by_key(&conn, key)