workflow name pattern update, remove tools under workflow

icgc-argo · May 6, 2020 · 8293706 · 8293706
1 parent a51e47b
commit 8293706
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/schemas/qc_metrics.json b/schemas/qc_metrics.json
@@ -13,7 +13,6 @@
             "workflow_name",
             "workflow_short_name",
             "workflow_version",
-            "analysis_tools",
             "genome_build",
             "run_id",
             "inputs"
@@ -22,7 +21,6 @@
         "required": [
           "workflow_name",
           "workflow_version",
-          "analysis_tools",
           "genome_build",
           "run_id",
           "inputs"
@@ -33,14 +31,11 @@
             "properties": {
               "workflow_name": {
                 "type": "string",
-                "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
+                "pattern": "^[a-zA-Z][a-zA-Z0-9 _\\-]+[a-zA-Z0-9]+$"
               },
               "workflow_short_name": {
                 "type": "string",
-                "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
-              },
-              "analysis_tools": {
-                "const": null
+                "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+[a-zA-Z0-9]+$"
               },
               "genome_build": {
                 "type": "string",

diff --git a/schemas/variant_calling.json b/schemas/variant_calling.json
@@ -14,7 +14,6 @@
             "workflow_name",
             "workflow_short_name",
             "workflow_version",
-            "analysis_tools",
             "genome_build",
             "run_id",
             "inputs"
@@ -24,7 +23,6 @@
           "workflow_name",
           "workflow_short_name",
           "workflow_version",
-          "analysis_tools",
           "genome_build",
           "run_id",
           "inputs"
@@ -33,18 +31,11 @@
         "properties": {
           "workflow_name": {
             "type": "string",
-            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
+            "pattern": "^[a-zA-Z][a-zA-Z0-9 _\\-]+[a-zA-Z0-9]+$"
           },
           "workflow_short_name": {
             "type": "string",
-            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
-          },
-          "analysis_tools": {
-            "type": ["array", "null"],
-            "items": {
-              "type": "string",
-              "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
-            }
+            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+[a-zA-Z0-9]+$"
           },
           "genome_build": {
             "type": "string",

diff --git a/schemas/variant_calling_supplement.json b/schemas/variant_calling_supplement.json
@@ -14,7 +14,6 @@
             "workflow_name",
             "workflow_short_name",
             "workflow_version",
-            "analysis_tools",
             "genome_build",
             "run_id",
             "inputs"
@@ -24,7 +23,6 @@
           "workflow_name",
           "workflow_short_name",
           "workflow_version",
-          "analysis_tools",
           "genome_build",
           "run_id",
           "inputs"
@@ -33,14 +31,11 @@
         "properties": {
           "workflow_name": {
             "type": "string",
-            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
+            "pattern": "^[a-zA-Z][a-zA-Z0-9 _\\-]+[a-zA-Z0-9]+$"
           },
           "workflow_short_name": {
             "type": "string",
-            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+$"
-          },
-          "analysis_tools": {
-            "const": null
+            "pattern": "^[a-zA-Z][a-zA-Z0-9_\\-]+[a-zA-Z0-9]+$"
           },
           "genome_build": {
             "type": "string",