[PLATFORM-1504]: Examples are not compiling with rust 1.75 (#189)

* Update dockerfile rust image to 1.75 * Refactor common to avoid having to publicly expose event_handlers with pub use
primait · Feb 9, 2024 · b0e27f3 · b0e27f3
1 parent b79b681
commit b0e27f3
Show file tree

Hide file tree

Showing 24 changed files with 69 additions and 54 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM public.ecr.aws/prima/rust:1.69.0
+FROM public.ecr.aws/prima/rust:1.75.0
 
 WORKDIR /code
 
 COPY entrypoint /code/entrypoint
 
-RUN cargo install sqlx-cli --no-default-features --features native-tls,postgres --version 0.6.2
+RUN cargo install sqlx-cli --no-default-features --features native-tls,postgres --version 0.7.1
 
 RUN chown -R app:app /code
 

diff --git a/examples/aggregate_deletion/main.rs b/examples/aggregate_deletion/main.rs
@@ -9,7 +9,10 @@ use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::store::{EventStore, StoreEvent};
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicError, BasicEvent, BasicEventHandler, BasicView};
+use crate::common::basic::event_handler::BasicEventHandler;
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError, BasicEvent};
+use crate::common::util::new_pool;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/common/basic/event_handler.rs b/examples/common/basic/event_handler.rs
@@ -5,7 +5,8 @@ use uuid::Uuid;
 use esrs::handler::EventHandler;
 use esrs::store::StoreEvent;
 
-use crate::common::{BasicAggregate, BasicEvent, BasicView};
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicEvent};
 
 #[derive(Clone)]
 pub struct BasicEventHandler {

diff --git a/examples/common/basic/mod.rs b/examples/common/basic/mod.rs
@@ -1,11 +1,9 @@
 use serde::{Deserialize, Serialize};
 
 use esrs::Aggregate;
-pub use event_handler::*;
-pub use view::*;
 
-mod event_handler;
-mod view;
+pub mod event_handler;
+pub mod view;
 
 #[derive(Clone)]
 pub struct BasicAggregate;

diff --git a/examples/common/basic/view.rs b/examples/common/basic/view.rs
@@ -1,7 +1,7 @@
 use sqlx::{Executor, Pool, Postgres};
 use uuid::Uuid;
 
-use crate::common::random_letters;
+use crate::common::util::random_letters;
 
 #[derive(sqlx::FromRow, Debug)]
 pub struct BasicViewRow {

diff --git a/examples/common/lib.rs b/examples/common/lib.rs
@@ -1,23 +1,15 @@
 //! Common structs shared between all the other examples
 
-pub use a::*;
-pub use b::*;
+pub mod a;
+pub mod b;
 #[cfg(feature = "postgres")]
-pub use basic::*;
-#[cfg(feature = "postgres")]
-pub use shared::*;
-pub use util::*;
-
-mod a;
-mod b;
-#[cfg(feature = "postgres")]
-mod basic;
+pub mod basic;
 
 #[allow(dead_code)]
 #[cfg(feature = "postgres")]
-mod shared;
+pub mod shared;
 
-mod util;
+pub mod util;
 
 #[derive(Debug, thiserror::Error)]
 pub enum CommonError {}
diff --git a/examples/common/shared/event_handler.rs b/examples/common/shared/event_handler.rs
@@ -4,7 +4,9 @@ use sqlx::{Pool, Postgres};
 use esrs::handler::{EventHandler, ReplayableEventHandler};
 use esrs::store::StoreEvent;
 
-use crate::common::{AggregateA, AggregateB, EventA, EventB, SharedView, UpsertSharedView};
+use crate::common::a::{AggregateA, EventA};
+use crate::common::b::{AggregateB, EventB};
+use crate::common::shared::view::{SharedView, UpsertSharedView};
 
 #[derive(Clone)]
 pub struct SharedEventHandler {

diff --git a/examples/common/shared/mod.rs b/examples/common/shared/mod.rs
@@ -1,5 +1,2 @@
-pub use event_handler::*;
-pub use view::*;
-
-mod event_handler;
-mod view;
+pub mod event_handler;
+pub mod view;
diff --git a/examples/common/shared/view.rs b/examples/common/shared/view.rs
@@ -1,7 +1,7 @@
 use sqlx::{Executor, Pool, Postgres};
 use uuid::Uuid;
 
-use crate::common::random_letters;
+use crate::common::util::random_letters;
 
 #[derive(Clone)]
 pub struct SharedView {

diff --git a/examples/event_bus/main.rs b/examples/event_bus/main.rs
@@ -20,7 +20,10 @@ use esrs::manager::AggregateManager;
 use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::AggregateState;
 
-use crate::common::{new_pool, random_letters, BasicAggregate, BasicCommand, BasicError, BasicEventHandler, BasicView};
+use crate::common::basic::event_handler::BasicEventHandler;
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError};
+use crate::common::util::{new_pool, random_letters};
 use crate::kafka::KafkaEventBusConsumer;
 use crate::rabbit::RabbitEventBusConsumer;
 

diff --git a/examples/event_bus/rabbit.rs b/examples/event_bus/rabbit.rs
@@ -8,7 +8,7 @@ use esrs::handler::EventHandler;
 use esrs::store::StoreEvent;
 use esrs::Aggregate;
 
-use crate::common::random_letters;
+use crate::common::util::random_letters;
 
 pub struct RabbitEventBusConsumer<A> {
     consumer: Consumer,

diff --git a/examples/eventual_view/main.rs b/examples/eventual_view/main.rs
@@ -9,7 +9,10 @@ use esrs::manager::AggregateManager;
 use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicError, BasicEventHandler, BasicView};
+use crate::common::basic::event_handler::BasicEventHandler;
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError};
+use crate::common::util::new_pool;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/locking_strategies/main.rs b/examples/locking_strategies/main.rs
@@ -45,7 +45,8 @@ use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::store::EventStore;
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicError, BasicEvent};
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError, BasicEvent};
+use crate::common::util::new_pool;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/multi_aggregate_rebuild/main.rs b/examples/multi_aggregate_rebuild/main.rs
@@ -21,9 +21,12 @@ use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::store::StoreEvent;
 use esrs::AggregateState;
 
-use crate::common::{
-    new_pool, AggregateA, AggregateB, CommandA, CommandB, CommonError, EventA, EventB, SharedEventHandler, SharedView,
-};
+use crate::common::a::{AggregateA, CommandA, EventA};
+use crate::common::b::{AggregateB, CommandB, EventB};
+use crate::common::shared::event_handler::SharedEventHandler;
+use crate::common::shared::view::SharedView;
+use crate::common::util::new_pool;
+use crate::common::CommonError;
 use crate::transactional_event_handler::SharedTransactionalEventHandler;
 
 #[path = "../common/lib.rs"]

diff --git a/examples/multi_aggregate_rebuild/transactional_event_handler.rs b/examples/multi_aggregate_rebuild/transactional_event_handler.rs
@@ -5,7 +5,9 @@ use esrs::handler::TransactionalEventHandler;
 use esrs::store::postgres::PgStoreError;
 use esrs::store::StoreEvent;
 
-use crate::common::{AggregateA, AggregateB, EventA, EventB, SharedView, UpsertSharedView};
+use crate::common::a::{AggregateA, EventA};
+use crate::common::b::{AggregateB, EventB};
+use crate::common::shared::view::{SharedView, UpsertSharedView};
 
 #[derive(Clone)]
 pub struct SharedTransactionalEventHandler {

diff --git a/examples/readme/main.rs b/examples/readme/main.rs
@@ -1,17 +1,15 @@
-use sqlx::{PgConnection, Pool, Postgres};
-
 use serde::{Deserialize, Serialize};
+use sqlx::{PgConnection, Pool, Postgres};
+use thiserror::Error;
 
+use esrs::bus::EventBus;
 use esrs::handler::{EventHandler, TransactionalEventHandler};
 use esrs::manager::AggregateManager;
 use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::store::StoreEvent;
 use esrs::Aggregate;
 
-use esrs::bus::EventBus;
-use thiserror::Error;
-
-use crate::common::new_pool;
+use crate::common::util::new_pool;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/rebuilder/event_handler.rs b/examples/rebuilder/event_handler.rs
@@ -4,11 +4,12 @@ use sqlx::{Pool, Postgres};
 use esrs::handler::{EventHandler, ReplayableEventHandler};
 use esrs::store::StoreEvent;
 
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicEvent};
+
 /// This is just an example. The need of v1 and v2 is due to having both the version of this event
 /// handler compiled in the code. In user codebase there will be only one `BasicEventHandler`
 /// got modified.
-use crate::common::{BasicAggregate, BasicEvent, BasicView};
-
 #[derive(Clone)]
 pub struct BasicEventHandlerV1 {
     pub pool: Pool<Postgres>,

diff --git a/examples/rebuilder/main.rs b/examples/rebuilder/main.rs
@@ -40,7 +40,9 @@ use esrs::rebuilder::{PgRebuilder, Rebuilder};
 use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicError, BasicView};
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError};
+use crate::common::util::new_pool;
 use crate::event_handler::{AnotherEventHandler, BasicEventHandlerV1, BasicEventHandlerV2};
 use crate::transactional_event_handler::{BasicTransactionalEventHandlerV1, BasicTransactionalEventHandlerV2};
 

diff --git a/examples/rebuilder/transactional_event_handler.rs b/examples/rebuilder/transactional_event_handler.rs
@@ -5,7 +5,8 @@ use esrs::handler::TransactionalEventHandler;
 use esrs::store::postgres::PgStoreError;
 use esrs::store::StoreEvent;
 
-use crate::common::{BasicAggregate, BasicEvent, BasicView};
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicEvent};
 
 /// The `BasicTransactionalEventHandlerV1` and `BasicTransactionalEventHandlerV1` exists in this
 /// example just for the sake of showing how a single transactional event handler, in this case called

diff --git a/examples/saga/main.rs b/examples/saga/main.rs
@@ -17,7 +17,8 @@ use esrs::store::EventStore;
 use esrs::AggregateState;
 
 use crate::aggregate::{SagaAggregate, SagaCommand, SagaEvent};
-use crate::common::{new_pool, CommonError};
+use crate::common::util::new_pool;
+use crate::common::CommonError;
 use crate::event_handler::SagaEventHandler;
 
 mod aggregate;

diff --git a/examples/shared_view/main.rs b/examples/shared_view/main.rs
@@ -7,9 +7,12 @@ use esrs::manager::AggregateManager;
 use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::AggregateState;
 
-use crate::common::{
-    new_pool, AggregateA, AggregateB, CommandA, CommandB, CommonError, SharedEventHandler, SharedView,
-};
+use crate::common::a::{AggregateA, CommandA};
+use crate::common::b::{AggregateB, CommandB};
+use crate::common::shared::event_handler::SharedEventHandler;
+use crate::common::shared::view::SharedView;
+use crate::common::util::new_pool;
+use crate::common::CommonError;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/store_crud/main.rs b/examples/store_crud/main.rs
@@ -40,7 +40,8 @@ use esrs::store::postgres::{PgStore, PgStoreBuilder};
 use esrs::store::{EventStore, StoreEvent};
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicEvent};
+use crate::common::basic::{BasicAggregate, BasicEvent};
+use crate::common::util::new_pool;
 
 #[path = "../common/lib.rs"]
 mod common;

diff --git a/examples/transactional_view/main.rs b/examples/transactional_view/main.rs
@@ -22,7 +22,9 @@ use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
 use esrs::store::EventStore;
 use esrs::AggregateState;
 
-use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicError, BasicView, BasicViewRow};
+use crate::common::basic::view::{BasicView, BasicViewRow};
+use crate::common::basic::{BasicAggregate, BasicCommand, BasicError};
+use crate::common::util::new_pool;
 use crate::transactional_event_handler::BasicTransactionalEventHandler;
 
 #[path = "../common/lib.rs"]

diff --git a/examples/transactional_view/transactional_event_handler.rs b/examples/transactional_view/transactional_event_handler.rs
@@ -5,7 +5,8 @@ use esrs::handler::TransactionalEventHandler;
 use esrs::store::postgres::PgStoreError;
 use esrs::store::StoreEvent;
 
-use crate::common::{BasicAggregate, BasicEvent, BasicView};
+use crate::common::basic::view::BasicView;
+use crate::common::basic::{BasicAggregate, BasicEvent};
 
 pub struct BasicTransactionalEventHandler {
     pub view: BasicView,