Fixing backward compatibility problems (#29)

* Fixing backward compatibility problems * FIxing tests * Remove tracing error --------- Co-authored-by: Paul Krishnamurthy <[email protected]>
picahq · May 16, 2024 · b806a77 · b806a77
1 parent d44fb5a
commit b806a77
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ futures-util = "0.3.28"
 handlebars = "4.4.0"
 http = "1.1.0"
 http-serde-ext = "1.0.2"
-integrationos-domain = "4.0.0"
+integrationos-domain = "4.1.1"
 js-sandbox-ios = "0.1.0"
 jsonpath_lib = "0.3.0"
 jsonwebtoken = "8.3.0"

diff --git a/README.md b/README.md
@@ -148,22 +148,16 @@ View the full guide [here](https://docs.integrationos.com/docs/quickstart).
     ```shell
     docker-compose up -d
     ```
-
-3. Load seed data
-
-    ```shell
-    source .env
-    docker-compose exec mongo mongorestore --host localhost --nsFrom="seed_db.*" --nsTo="events-service.*" --authenticationDatabase admin -u integrationos -p $MONGO_PASSWORD /seed-data
-    ```
-
-4. Run migrations
+3. Run migrations
 
     ```shell
     source .env
     docker-compose -f docker-compose.data.yml run --rm migrate-before
     docker-compose -f docker-compose.data.yml run --rm migrate-after
     ```
 
+**Note:** If you want to run the latest version of the docker image, you can use the latest git commit hash as the tag. For example, `integrationos/integrationos:<commit-hash>`.
+
 ## Other actions
 
 Connecting to a MongoDB shell

diff --git a/api/src/config.rs b/api/src/config.rs
@@ -6,7 +6,7 @@ use std::{
 use envconfig::Envconfig;
 use integrationos_domain::cache::CacheConfig as RedisConfig;
 use integrationos_domain::{
-    claude::ClaudeConfig, database::DatabaseConfig, openai::OpenAiConfig, secrets::SecretsConfig,
+    database::DatabaseConfig, openai::OpenAiConfig, secrets::SecretsConfig,
 };
 
 #[derive(Envconfig, Clone)]
@@ -69,8 +69,6 @@ pub struct Config {
     #[envconfig(nested = true)]
     pub db_config: DatabaseConfig,
     #[envconfig(nested = true)]
-    pub claude_config: ClaudeConfig,
-    #[envconfig(nested = true)]
     pub openai_config: OpenAiConfig,
     #[envconfig(nested = true)]
     pub redis_config: RedisConfig,
@@ -118,7 +116,6 @@ impl Display for Config {
         writeln!(f, "MOCK_LLM: {}", self.mock_llm)?;
         writeln!(f, "{}", self.headers)?;
         writeln!(f, "{}", self.db_config)?;
-        writeln!(f, "{}", self.claude_config)?;
         writeln!(f, "{}", self.openai_config)?;
         writeln!(f, "{}", self.redis_config)
     }

diff --git a/api/src/endpoints/common_enum.rs b/api/src/endpoints/common_enum.rs
@@ -4,7 +4,7 @@ use axum::{
     extract::{Query, State},
     Json,
 };
-use integrationos_domain::{algebra::StoreExt, common_model::CommonEnum};
+use integrationos_domain::common_model::CommonEnum;
 use shape_mongo_filter::DELETED_STR;
 use std::{collections::BTreeMap, sync::Arc};
 use tokio::try_join;

diff --git a/api/src/endpoints/common_model.rs b/api/src/endpoints/common_model.rs
@@ -10,7 +10,7 @@ use axum::{
     Router,
 };
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     api_model_config::Lang,
     common_model::{CommonModel, Field},
     id::{prefix::IdPrefix, Id},

diff --git a/api/src/endpoints/connection.rs b/api/src/endpoints/connection.rs
@@ -17,7 +17,7 @@ use chrono::Utc;
 use convert_case::{Case, Casing};
 use http::HeaderMap;
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     connection_definition::ConnectionDefinition,
     domain::connection::SanitizedConnection,
     event_access::EventAccess,

diff --git a/api/src/endpoints/connection_definition.rs b/api/src/endpoints/connection_definition.rs
@@ -12,7 +12,7 @@ use axum::{
     Json, Router,
 };
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     api_model_config::AuthMethod,
     connection_definition::ConnectionStatus,
     connection_definition::{

diff --git a/api/src/endpoints/connection_model_definition.rs b/api/src/endpoints/connection_model_definition.rs
@@ -15,7 +15,7 @@ use bson::SerializerOptions;
 use chrono::Utc;
 use http::HeaderMap;
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     api_model_config::{
         ApiModelConfig, AuthMethod, ModelPaths, ResponseBody, SamplesInput, SchemasInput,
     },

diff --git a/api/src/endpoints/connection_model_schema.rs b/api/src/endpoints/connection_model_schema.rs
@@ -9,7 +9,7 @@ use axum::{
     Json, Router,
 };
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     connection_model_schema::{ConnectionModelSchema, Mappings, SchemaPaths},
     id::{prefix::IdPrefix, Id},
     json_schema::JsonSchema,

diff --git a/api/src/endpoints/event_access.rs b/api/src/endpoints/event_access.rs
@@ -16,7 +16,7 @@ use axum::{
 use integrationos_domain::{
     access_key_data::AccessKeyData,
     access_key_prefix::AccessKeyPrefix,
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     connection_definition::{ConnectionDefinitionType, Paths},
     environment::Environment,
     event_access::EventAccess,

diff --git a/api/src/endpoints/mod.rs b/api/src/endpoints/mod.rs
@@ -13,9 +13,8 @@ use axum::{
 use bson::{doc, SerializerOptions};
 use http::{HeaderMap, HeaderValue, StatusCode};
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
-    event_access::EventAccess,
-    ApplicationError, Connection, IntegrationOSError, InternalError, OAuth, Store,
+    algebra::MongoStore, event_access::EventAccess, ApplicationError, Connection,
+    IntegrationOSError, InternalError, OAuth, Store,
 };
 use moka::future::Cache;
 use mongodb::options::FindOneOptions;

diff --git a/api/src/endpoints/oauth.rs b/api/src/endpoints/oauth.rs
@@ -8,7 +8,7 @@ use axum::{
 use chrono::{Duration, Utc};
 use http::{HeaderMap, HeaderName, HeaderValue};
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt, TemplateExt},
+    algebra::{MongoStore, TemplateExt},
     api_model_config::ContentType,
     connection_definition::ConnectionDefinition,
     connection_oauth_definition::{
@@ -32,7 +32,6 @@ use std::{
 };
 use tracing::{debug, error};
 
-// TODO: Write documentation
 pub fn get_router() -> Router<Arc<AppState>> {
     Router::new().route("/:platform", post(oauth_handler))
 }

diff --git a/api/src/endpoints/openapi.rs b/api/src/endpoints/openapi.rs
@@ -11,7 +11,7 @@ use futures::{Stream, StreamExt, TryStreamExt};
 use http::StatusCode;
 use indexmap::IndexMap;
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt, TimedExt},
+    algebra::{MongoStore, TimedExt},
     common_model::{CommonEnum, CommonModel},
 };
 use mongodb::error::Error as MongoError;

diff --git a/api/src/endpoints/platform_page.rs b/api/src/endpoints/platform_page.rs
@@ -10,7 +10,7 @@ use axum::{
 };
 use convert_case::{Case, Casing};
 use integrationos_domain::{
-    algebra::{MongoStore, StoreExt},
+    algebra::MongoStore,
     event_access::EventAccess,
     hashed_secret::HashedSecret,
     id::{prefix::IdPrefix, Id},

diff --git a/api/src/middleware/auth.rs b/api/src/middleware/auth.rs
@@ -1,7 +1,7 @@
 use crate::{endpoints::ApiError, internal_server_error, server::AppState, unauthorized};
 use axum::{body::Body, extract::State, middleware::Next, response::Response};
 use http::Request;
-use integrationos_domain::{algebra::StoreExt, ApplicationError, InternalError};
+use integrationos_domain::{ApplicationError, InternalError};
 use mongodb::bson::doc;
 use std::sync::Arc;
 use tracing::error;

diff --git a/api/src/routes/mod.rs b/api/src/routes/mod.rs
@@ -15,8 +15,8 @@ pub async fn get_router(state: &Arc<AppState>) -> Router<Arc<AppState>> {
     let path = format!("/{}", state.config.api_version);
     let public_path = format!("{path}/public");
     Router::new()
-        .nest(&path, protected::get_router(state).await)
         .nest(&public_path, public::get_router(state))
+        .nest(&path, protected::get_router(state).await)
         .nest(&path, authenticated::get_router(state).await)
         .route("/", get(get_root))
         .fallback(not_found_handler)

diff --git a/api/tests/api_tests/test_server/mod.rs b/api/tests/api_tests/test_server/mod.rs
@@ -15,7 +15,7 @@ use http::{header::AUTHORIZATION, Method};
 use integrationos_domain::{
     access_key_data::AccessKeyData,
     access_key_prefix::AccessKeyPrefix,
-    algebra::{CryptoExt, MongoStore, StoreExt},
+    algebra::{CryptoExt, MongoStore},
     api_model_config::{AuthMethod, SamplesInput, SchemasInput},
     connection_definition::{ConnectionDefinition, ConnectionDefinitionType},
     connection_model_definition::{
@@ -155,7 +155,7 @@ impl TestServer {
 
         // Random database name
         let db_name = db_name.unwrap_or_else(|| Uuid::new_v4().to_string());
-        let token_secret = "atveroeosetaccusamusetiustoodiodignissimosducimus".to_string();
+        let token_secret = "Qsfb9YUkdjwUULX.u96HdTCX4q7GuB".to_string();
 
         let config = Config::init_from_hashmap(&HashMap::from([
             ("CONTROL_DATABASE_URL".to_string(), db.clone()),

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -140,8 +140,15 @@ services:
     environment:
       - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}
       - MONGO_INITDB_ROOT_USERNAME=integrationos
+
+  setup:
+    image: mongo:6.0
+    depends_on:
+      - mongo
+    restart: "no"
     volumes:
       - ./seed-data:/seed-data:ro
+    entrypoint: ["/bin/bash", "-c", "sleep 10 && mongorestore --host mongo --nsFrom='seed_db.*' --nsTo='events-service.*' --authenticationDatabase admin -u integrationos -p ${MONGO_PASSWORD} /seed-data"]
 
   redis:
     image: redis:7.0
diff --git a/event-core/src/mongo_control_data_store.rs b/event-core/src/mongo_control_data_store.rs
@@ -9,7 +9,7 @@ use futures::future::join_all;
 use handlebars::Handlebars;
 use http::header::AUTHORIZATION;
 use integrationos_domain::{
-    algebra::{CryptoExt, FecherExt, GoogleTokenFetcher, MongoStore, StoreExt},
+    algebra::{CryptoExt, FecherExt, GoogleTokenFetcher, MongoStore},
     client::unified_destination_client::UnifiedDestination,
     duplicates::Duplicates,
     encrypted_access_key::EncryptedAccessKey,

diff --git a/event-core/tests/mock_destination.rs b/event-core/tests/mock_destination.rs
@@ -101,7 +101,7 @@ pub async fn seed_db(config: &EventCoreConfig, base_url: String) -> Id {
         id: Id::new_with_uuid(IdPrefix::Connection, ts, uuid),
         platform_version: "platformVersion".to_string(),
         connection_definition_id: Id::new_with_uuid(IdPrefix::ConnectionDefinition, ts, uuid),
-        r#type: ConnectionType::Api,
+        r#type: ConnectionType::Api {},
         name: "name".to_string(),
         key: "key".into(),
         group: "group".to_string(),

diff --git a/gateway/src/finalizer.rs b/gateway/src/finalizer.rs
@@ -2,7 +2,7 @@ use crate::{config::Config, finalize_event::FinalizeEvent};
 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
 use integrationos_domain::{
-    algebra::{MongoStore, RedisCache, StoreExt},
+    algebra::{MongoStore, RedisCache},
     {
         encrypted_access_key::EncryptedAccessKey, event_with_context::EventWithContext, Event,
         RootContext, Store,