chore: remove unnecessary option

getdozer · Oct 5, 2023 · 312009f · 312009f
1 parent 209d5b6
commit 312009f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 48 deletions.
diff --git a/dozer-cli/src/cli/init.rs b/dozer-cli/src/cli/init.rs
@@ -130,7 +130,7 @@ pub fn generate_connection(connection_name: &str) -> Connection {
                 bucket_name: "<your_bucket_name>".to_owned(),
             };
             let s3_config = S3Storage {
-                details: Some(s3_details),
+                details: s3_details,
                 tables: vec![],
             };
             let connection: Connection = Connection {

diff --git a/dozer-ingestion/src/connectors/object_store/adapters.rs b/dozer-ingestion/src/connectors/object_store/adapters.rs
@@ -1,4 +1,4 @@
-use crate::errors::ObjectStoreObjectError::{MissingStorageDetails, TableDefinitionNotFound};
+use crate::errors::ObjectStoreObjectError::TableDefinitionNotFound;
 use crate::errors::{ConnectorError, ObjectStoreConnectorError};
 use dozer_types::ingestion_types::{LocalStorage, S3Storage, Table};
 use object_store::aws::{AmazonS3, AmazonS3Builder};
@@ -54,7 +54,7 @@ impl DozerObjectStore for S3Storage {
         &self,
         table: &Table,
     ) -> Result<DozerObjectStoreParams<Self::ObjectStore>, ConnectorError> {
-        let details = get_details(&self.details)?;
+        let details = &self.details;
 
         let retry_config = RetryConfig {
             backoff: BackoffConfig::default(),
@@ -116,7 +116,7 @@ impl DozerObjectStore for LocalStorage {
         &self,
         table: &Table,
     ) -> Result<DozerObjectStoreParams<Self::ObjectStore>, ConnectorError> {
-        let path = get_details(&self.details)?.path.as_str();
+        let path = &self.details.path.as_str();
 
         let object_store = LocalFileSystem::new_with_prefix(path)
             .map_err(|e| ConnectorError::InitializationError(e.to_string()))?;
@@ -158,11 +158,3 @@ impl DozerObjectStore for LocalStorage {
         &self.tables
     }
 }
-
-fn get_details<T>(details: &Option<T>) -> Result<&T, ObjectStoreConnectorError> {
-    details
-        .as_ref()
-        .ok_or(ObjectStoreConnectorError::DataFusionStorageObjectError(
-            MissingStorageDetails,
-        ))
-}
diff --git a/dozer-types/src/ingestion_types.rs b/dozer-types/src/ingestion_types.rs
@@ -335,16 +335,14 @@ pub struct LocalDetails {
 
 #[derive(Debug, Serialize, Deserialize, Eq, PartialEq, Clone, Hash, JsonSchema)]
 pub struct LocalStorage {
-    pub details: Option<LocalDetails>,
+    pub details: LocalDetails,
 
     pub tables: Vec<Table>,
 }
 
 impl LocalStorage {
     pub fn convert_to_table(&self) -> PrettyTable {
-        self.details
-            .as_ref()
-            .map_or_else(|| table!(), |details| table!(["path", details.path]))
+        table!(["path", self.details.path])
     }
 }
 

diff --git a/json_schemas/connections.json b/json_schemas/connections.json
@@ -387,18 +387,12 @@
       "title": "S3Storage",
       "type": "object",
       "required": [
+        "details",
         "tables"
       ],
       "properties": {
         "details": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/S3Details"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "$ref": "#/definitions/S3Details"
         },
         "tables": {
           "type": "array",
@@ -555,18 +549,12 @@
       "title": "LocalStorage",
       "type": "object",
       "required": [
+        "details",
         "tables"
       ],
       "properties": {
         "details": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/LocalDetails"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "$ref": "#/definitions/LocalDetails"
         },
         "tables": {
           "type": "array",

diff --git a/json_schemas/dozer.json b/json_schemas/dozer.json
@@ -1051,18 +1051,12 @@
     "LocalStorage": {
       "type": "object",
       "required": [
+        "details",
         "tables"
       ],
       "properties": {
         "details": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/LocalDetails"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "$ref": "#/definitions/LocalDetails"
         },
         "tables": {
           "type": "array",
@@ -1406,18 +1400,12 @@
     "S3Storage": {
       "type": "object",
       "required": [
+        "details",
         "tables"
       ],
       "properties": {
         "details": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/S3Details"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "$ref": "#/definitions/S3Details"
         },
         "tables": {
           "type": "array",