adjustments

icgc-argo · Mar 10, 2020 · 8311a69 · 8311a69
1 parent 8ae420d
commit 8311a69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/schemas/qc_metrics.json b/schemas/qc_metrics.json
@@ -11,7 +11,6 @@
         "propertyNames": {
           "enum": [
             "name",
-            "short_name",
             "version",
             "run_id",
             "inputs"
@@ -36,7 +35,7 @@
                 "items": {
                   "type": "object",
                   "properties": {
-                    "id": {
+                    "input_analysis_id": {
                       "type": "string",
                       "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
                     },
@@ -53,12 +52,6 @@
               },
               "version": {
                 "type": "string"
-              },
-              "short_name": {
-                "type": [
-                  "string",
-                  "null"
-                ]
               }
             }
           },

diff --git a/schemas/sequencing_alignment.json b/schemas/sequencing_alignment.json
@@ -13,7 +13,6 @@
         "propertyNames": {
           "enum": [
             "name",
-            "short_name",
             "version",
             "run_id",
             "inputs"
@@ -38,7 +37,7 @@
                 "items": {
                   "type": "object",
                   "properties": {
-                    "id": {
+                    "input_analysis_id": {
                       "type": "string",
                       "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
                     },
@@ -55,12 +54,6 @@
               },
               "version": {
                 "type": "string"
-              },
-              "short_name": {
-                "type": [
-                  "string",
-                  "null"
-                ]
               }
             }
           },
@@ -203,7 +196,8 @@
             {
               "properties": {
                 "submitter_read_group_id": {
-                  "type": "string"
+                  "type": "string",
+                  "pattern": "^[a-zA-Z0-9_\:\.\-]+$"
                 },
                 "library_name": {
                   "type": "string"
@@ -300,4 +294,4 @@
       }
     }
   }
-}
+}
diff --git a/schemas/sequencing_experiment.json b/schemas/sequencing_experiment.json
@@ -128,7 +128,8 @@
             {
               "properties": {
                 "submitter_read_group_id": {
-                  "type": "string"
+                  "type": "string",
+                  "pattern": "^[a-zA-Z0-9_\:\.\-]+$"
                 },
                 "library_name": {
                   "type": "string"
@@ -225,4 +226,4 @@
       }
     }
   }
-}
+}