feat: remove errors crate

Cargo.toml

@@ -3,7 +3,6 @@
 members = [
     "amqp",
     "env",
-    "errors",
     "health_readiness",
     "httpw",
     "logging",

amqp/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 mocks = ["dep:mockall"]
 
 [dependencies]
-errors = { path = "../errors" }
 env = { path = "../env" }
 traces = { path = "../traces" }
 
@@ -20,6 +19,7 @@ serde_json = { version = "1.0.91" }
 serde = { version = "1.0.152", features = ["derive"] }
 tokio = { version = "1.25.0", features = ["default"] }
 futures-util = { version = "0.3.26"}
+thiserror = { version = "1.0.38" }
 
 # Used only with feature mock
 mockall = { version = "0.11.3", optional = true }

amqp/src/client.rs

@@ -1,13 +1,11 @@
-use crate::types::PublishParams;
-
 use super::{
     defs,
     topology::ExchangeKind as MyExchangeKind,
     types::{AmqpPayload, AmqpTracePropagator},
 };
+use crate::{errors::AmqpError, types::PublishParams};
 use async_trait::async_trait;
 use env::{Configs, DynamicConfig};
-use errors::amqp::AmqpError;
 use lapin::{
     message::BasicGetMessage,
     options::{

amqp/src/consumer.rs

@@ -1,9 +1,9 @@
 use crate::{
     client::Amqp,
+    errors::AmqpError,
     topology::{ConsumerHandler, QueueDefinition},
     types::{new_span, Metadata},
 };
-use errors::amqp::AmqpError;
 use lapin::{
     message::Delivery,
     options::{BasicAckOptions, BasicNackOptions, BasicPublishOptions},

amqp/src/dispatcher.rs

@@ -1,9 +1,9 @@
 use crate::{
     client::Amqp,
     consumer::consume,
+    errors::AmqpError,
     topology::{ConsumerHandler, QueueDefinition},
 };
-use errors::amqp::AmqpError;
 use futures_util::{future::join_all, StreamExt};
 use opentelemetry::global;
 use std::sync::Arc;

amqp/src/lib.rs

@@ -3,6 +3,7 @@ mod consumer;
 pub mod client;
 pub mod defs;
 pub mod dispatcher;
+pub mod errors;
 #[cfg(test)]
 pub mod mocks;
 #[cfg(feature = "mocks")]

amqp/src/mocks.rs

@@ -2,9 +2,8 @@ use super::{
     topology::ExchangeKind as MyExchangeKind,
     types::{AmqpPayload, PublishParams},
 };
-use crate::client::Amqp;
+use crate::{client::Amqp, errors::AmqpError};
 use async_trait::async_trait;
-use errors::amqp::AmqpError;
 use lapin::{
     message::BasicGetMessage,
     types::{AMQPValue, FieldTable, ShortString},

amqp/src/topology.rs

@@ -1,10 +1,8 @@
-use std::{collections::BTreeMap, sync::Arc};
-
-use crate::{client::Amqp, defs};
+use crate::{client::Amqp, defs, errors::AmqpError};
 use async_trait::async_trait;
-use errors::amqp::AmqpError;
 use lapin::types::{AMQPValue, FieldTable, LongInt, LongString, ShortString};
 use opentelemetry::Context;
+use std::{collections::BTreeMap, sync::Arc};
 use tracing::debug;
 
 #[derive(Debug, Clone, Default)]

amqp/src/types.rs

@@ -1,5 +1,5 @@
 use super::defs;
-use errors::amqp::AmqpError;
+use crate::errors::AmqpError;
 use lapin::{
     protocol::basic::AMQPProperties,
     types::{AMQPValue, FieldTable, LongInt, ShortString},

auth/src/defs.rs

@@ -1,11 +1,8 @@
 pub enum UsersScopes {}
 
-pub enum ThingsScopes {}
-
 pub enum PlatformScopes {}
 
 pub enum Scopes {
     USER(UsersScopes),
-    THING(ThingsScopes),
     PLATFORM(PlatformScopes),
 }

auth/src/lib.rs

@@ -2,4 +2,4 @@ mod defs;
 pub mod jwt_manager;
 mod types;
 
-pub use defs::{PlatformScopes, Scopes, ThingsScopes, UsersScopes};
+pub use defs::{PlatformScopes, Scopes, UsersScopes};