Merge remote-tracking branch 'refs/remotes/origin/master' into featur…

…e/update-tombstone-request

data-model/developer-schema/machine-annotation-service/0.3.0/schema/machine-annotation-service-request.json

@@ -153,6 +153,19 @@
       "type": "object",
       "description": "Object containing the tombstone metadata of the object",
       "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json"
+    },
+    "ods:hasEnvironment": {
+      "type": "array",
+      "description": "Environmental variables to supply to the MAS, non-sensitive",
+      "items": {
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
+      }
+    },
+    "ods:hasSecret": {
+      "type": "array",
+      "items": {
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
+      }
     }
   },
   "required": [

data-model/developer-schema/source-system/0.3.0/schema/source-system-request.json

@@ -34,6 +34,11 @@
         "Specify 7"
       ]
     },
+    "ods:maximumRecords": {
+      "type": "integer",
+      "minimum": 1,
+      "description": "An optional parameter to limit the number of records to be ingested from this sourceSystem, it will pick the first X number of records it encounters. If left empty or absent it will process all records."
+    },
     "ods:translatorType": {
       "description": "The serialisation of the data the endpoint provides indicating what type of Translator is required",
       "enum": [

data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-environment.json

@@ -0,0 +1,36 @@
+{
+  "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$comment": "Machine Annotation Service Environment Version 0.3.0",
+  "title": "MachineAnnotationServiceEnvironment",
+  "type": "object",
+  "description": "Environmental variables to supply to the MAS, non-sensitive",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of a non-sensitive property or environmental variable",
+      "examples": [
+        "server.port",
+        "spring.profiles.active"
+      ]
+    },
+    "value": {
+      "type": [
+        "string",
+        "integer",
+        "boolean",
+        "null"
+      ],
+      "description": "Value to be stored in the \"name\" field. NOT for sensitive information.",
+      "examples": [
+        8080,
+        "web-profile"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "value"
+  ]
+}

data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-secret.json

@@ -0,0 +1,30 @@
+{
+  "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$comment": "Machine Annotation Service Environment Version 0.3.0",
+  "title": "MachineAnnotationServiceSecret",
+  "type": "object",
+  "description": "Remote secrets to supply to the MAS",
+  "properties": {
+    "secretName": {
+      "type": "string",
+      "description": "The name of an environmental variable stored remotely",
+      "examples": [
+        "database.password",
+        "keycloak.secret"
+      ]
+    },
+    "secretKeyRef": {
+      "type": "string",
+      "description": "The name of the key stored in the secret store. NOT the secret's value.",
+      "example": [
+        "db-password"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "secretKeyRef"
+  ]
+}

data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service.json

@@ -216,6 +216,19 @@
       "type": "object",
       "description": "Object containing the tombstone metadata of the object",
       "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json"
+    },
+    "ods:hasEnvironment": {
+      "type": "array",
+      "description": "Environmental variables to supply to the MAS, non-sensitive",
+      "items": {
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
+      }
+    },
+    "ods:hasSecret": {
+      "type": "array",
+      "items": {
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
+      }
     }
   },
   "required": [

data-model/fdo-type/source-system/0.3.0/schema/source-system.json

@@ -104,6 +104,11 @@
         "biocase"
       ]
     },
+    "ods:maximumRecords": {
+      "type": "integer",
+      "minimum": 1,
+      "description": "An optional parameter to limit the number of records to be ingested from this sourceSystem, it will pick the first X number of records it encounters. If left empty or absent it will process all records."
+    },
     "ods:dataMappingID": {
       "type": "string",
       "description": "The Handle of the Mapping Object needed for this Source System",