fix: fix merge conflicts

Exabyte-io · Feb 23, 2024 · ac452e2 · ac452e2
2 parents ae79613 + 667c49e
commit ac452e2
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/schema/core/reusable/object_storage_container_data.json b/schema/core/reusable/object_storage_container_data.json
@@ -28,11 +28,5 @@
             "description": "Unix timestamp showing when the file was last modified",
             "type": "string"
         }
-    },
-    "required": [
-        "CONTAINER",
-        "NAME",
-        "PROVIDER",
-        "REGION"
-    ]
+    }
 }
diff --git a/schema/workflow/unit/io/api.json b/schema/workflow/unit/io/api.json
@@ -20,5 +20,6 @@
     "required": [
         "endpoint",
         "endpoint_options"
-    ]
+    ],
+    "additionalProperties": true
 }
diff --git a/schema/workflow/unit/io/db.json b/schema/workflow/unit/io/db.json
@@ -16,7 +16,8 @@
             },
             "required": [
                 "ids"
-            ]
+            ],
+            "additionalProperties": true
         },
         {
             "properties": {
@@ -33,7 +34,8 @@
             "required": [
                 "collection",
                 "draft"
-            ]
+            ],
+            "additionalProperties": true
         }
     ]
 }
diff --git a/schema/workflow/unit/io/object_storage.json b/schema/workflow/unit/io/object_storage.json
@@ -19,7 +19,7 @@
         }
     },
     "required": [
-        "objectData",
-        "basename"
-    ]
+        "objectData"
+    ],
+    "additionalProperties": true
 }
diff --git a/src/py/mat3ra/esse/data/schemas.py b/src/py/mat3ra/esse/data/schemas.py
diff --git a/tests/js/validate.ts b/tests/js/validate.ts
@@ -50,3 +50,24 @@ describe("schema titles must be unique or empty", () => {
     // eslint-disable-next-line no-unused-expressions
     expect(repeatedSchemaTitles).to.be.an("array").that.is.empty;
 });
+
+describe("default", () => {
+    JSONSchemasInterface.setSchemaFolder(schemasPath);
+    const schema = JSONSchemasInterface.getSchemaById("job/compute");
+    const example = JSON.parse(
+        fs.readFileSync(path.join(examplesPath, "job/compute.json")).toString(),
+    ) as object;
+    if (schema) {
+        // @ts-ignore
+        const { arguments: args, ...restExample } = example;
+        console.log({
+            restExample,
+            args,
+        });
+        ajv.validate(restExample, schema);
+        console.log({
+            restExample,
+            example,
+        });
+    }
+});