diff --git a/data/validation_schema/minimal_metadata_validation.json b/data/validation_schema/minimal_metadata_validation.json index 9ad5b908..31442021 100644 --- a/data/validation_schema/minimal_metadata_validation.json +++ b/data/validation_schema/minimal_metadata_validation.json @@ -4,7 +4,7 @@ "title": "IGF minimal metadata validation schema", "description": "Schema for validation of minimal metadata input file", "type" : "array", - "version": "1.0.0", + "version": "1.1.0", "minItems": 1, "uniqueItems": true, "items": { @@ -13,17 +13,19 @@ "project_igf_id" : { "type" : "string", "pattern": "^IGF[a-zA-Z0-9-_]+$", - "maxLength": 50 + "maxLength": 70 }, "deliverable" : { "type" : "string", - "enum" : ["FASTQ", - "COSMX"] + "enum" : [ + "FASTQ", + "COSMX" + ] }, "name" : { "type" : "string", "pattern": "^\\w+\\s\\w+\\s?\\w+?$", - "maxLength": 30 + "maxLength": 40 }, "username" : { "type" : "string", @@ -50,6 +52,7 @@ "deliverable", "name", "email_id", - "username"] + "username" + ] } } \ No newline at end of file diff --git a/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py b/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py index 31d44dd6..ee70f5e5 100644 --- a/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py +++ b/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py @@ -33,11 +33,11 @@ default_var='/api/v1/raw_cosmx_metadata/mark_ready_metadata_as_synced' ) METADATA_VALIDATION_SCHEMA = Variable.get( - 'igf_portal_conf', + 'manual_metadata_validation_schema', default_var=None ) DEFAULT_EMAIL = Variable.get( - 'default_email', + 'default_email_user', default_var=None )