Merge pull request #21 from stack-spot/val-regex-fields

Val regex fields
stack-spot · Feb 13, 2023 · 343fdd0 · 343fdd0
2 parents b63e1f3 + db8023c
commit 343fdd0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/stackspot_store/schemas/metadata/v1/schema.json b/stackspot_store/schemas/metadata/v1/schema.json
@@ -13,7 +13,7 @@
       },
       "version": {
         "type": "string",
-        "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
+        "pattern": "^\\d{1,2}.\\d{1,2}.\\d{1,3}$|^latest$"
       },
       "picture": {
         "type": "string"

diff --git a/stackspot_store/schemas/plugin/v1/_definitions.json b/stackspot_store/schemas/plugin/v1/_definitions.json
@@ -62,6 +62,13 @@
         "items": {
             "type": "string"
         }
+      },
+      "repository": {
+        "type": "string"
+      },
+      "requires-plugin": {
+        "type": "array",
+        "items": {"type": "string"}
       }
   }
 }
diff --git a/stackspot_store/schemas/plugin/v1/app-schema.json b/stackspot_store/schemas/plugin/v1/app-schema.json
@@ -24,14 +24,11 @@
           "inputs-envs": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/inputs" },
           "compatibility": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/compatibility" },
           "technologies": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/technologies" },
-          "repository": { "type": "string"},
+          "repository": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/repository" },
           "requires": {
             "type": "object",
             "properties": {
-              "plugin": {
-                "type": "array",
-                "items": {"type": "string"}
-              },
+              "plugin": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/requires-plugin" },
               "connection-interface": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/connection-interface" }
             }
           }

diff --git a/stackspot_store/schemas/plugin/v1/infra-schema.json b/stackspot_store/schemas/plugin/v1/infra-schema.json
@@ -24,7 +24,7 @@
           "inputs-envs": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/inputs" },
           "compatibility": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/compatibility" },
           "technologies": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/technologies" },
-          "repository": { "type": "string"},
+          "repository": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/repository" },
           "generates": { "$ref": "https://raw.githubusercontent.com/stack-spot/schemastore-stackspot/main/stackspot_store/schemas/plugin/v1/_definitions.json#/definitions/generates" },
           "requires": {
             "type": "object",