@swovohq/fuel 0.2.2-alpha.88 → 0.2.2-alpha.89

package/schema/fuel.schema.json

@@ -2,58 +2,25 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "oneOf": [
     {
-      "$ref": "#/definitions/ecsConfig"
+      "allOf": [
+        {
+          "$ref": "#/definitions/ecsConfig"
+        }
+      ]
     },
     {
       "$ref": "#/definitions/azureConfig"
     }
   ],
   "definitions": {
-    "ecsConfig": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "minLength": 1
-        },
-        "slack_webhook_url": {
-          "type": "string"
-        },
-        "github_repo_name": {
-          "description": "Name of the GitHub repository to create/use. Defaults to \"${name}-monorepo\". Set this explicitly when this fuel.yml should target a repo already used by another environment (e.g. a separate prod fuel.yml with its own `name` pointing at the same repo as dev).",
-          "type": "string"
-        },
-        "deployment": {
-          "type": "string",
-          "const": "ecs"
-        },
-        "ssl": {
-          "type": "string",
-          "minLength": 1,
-          "description": "ACM certificate ARN attached to the ALB HTTPS listener, e.g. arn:aws:acm:us-east-1:ACCOUNT_ID:certificate/CERTIFICATE_ID."
-        },
-        "apps": {
-          "minItems": 1,
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ecsApp"
-          }
-        }
-      },
-      "required": [
-        "name",
-        "deployment",
-        "ssl",
-        "apps"
-      ],
-      "additionalProperties": {}
-    },
     "ecsApp": {
       "type": "object",
       "properties": {
         "name": {
           "type": "string",
-          "minLength": 1
+          "minLength": 1,
+          "maxLength": 32,
+          "pattern": "^[a-z0-9]([a-z0-9-]*[a-z0-9])?$"
         },
         "technology": {
           "type": "string",
@@ -176,7 +143,9 @@
         "name": {
           "type": "string",
           "minLength": 1,
-          "description": "Worker name. Used as the ECS service name / Container App name depending on deployment."
+          "maxLength": 32,
+          "pattern": "^[a-z0-9]([a-z0-9-]*[a-z0-9])?$",
+          "description": "Worker name. Used as the ECS service name."
         },
         "dockerfile": {
           "type": "string",
@@ -190,6 +159,47 @@
       ],
       "additionalProperties": {}
     },
+    "ecsConfig": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 20,
+          "pattern": "^[a-z0-9]([a-z0-9-]*[a-z0-9])?$"
+        },
+        "slack_webhook_url": {
+          "type": "string"
+        },
+        "github_repo_name": {
+          "description": "Name of the GitHub repository to create/use. Defaults to \"${name}-monorepo\". Set this explicitly when this fuel.yml should target a repo already used by another environment (e.g. a separate prod fuel.yml with its own `name` pointing at the same repo as dev).",
+          "type": "string"
+        },
+        "deployment": {
+          "type": "string",
+          "const": "ecs"
+        },
+        "ssl": {
+          "type": "string",
+          "minLength": 1,
+          "description": "ACM certificate ARN attached to the ALB HTTPS listener, e.g. arn:aws:acm:us-east-1:ACCOUNT_ID:certificate/CERTIFICATE_ID."
+        },
+        "apps": {
+          "minItems": 1,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ecsApp"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "deployment",
+        "ssl",
+        "apps"
+      ],
+      "additionalProperties": {}
+    },
     "azureConfig": {
       "type": "object",
       "properties": {
@@ -379,7 +389,9 @@
       "properties": {
         "name": {
           "type": "string",
-          "minLength": 1
+          "minLength": 2,
+          "maxLength": 32,
+          "pattern": "^[a-z][a-z0-9]*(-[a-z0-9]+)*$"
         },
         "technology": {
           "type": "string",
@@ -436,7 +448,7 @@
           "default": [],
           "type": "array",
           "items": {
-            "$ref": "#/definitions/worker"
+            "$ref": "#/definitions/azureWorker"
           }
         },
         "database": {
@@ -598,6 +610,28 @@
         "container_app"
       ],
       "additionalProperties": {}
+    },
+    "azureWorker": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 2,
+          "maxLength": 32,
+          "pattern": "^[a-z][a-z0-9]*(-[a-z0-9]+)*$",
+          "description": "Worker name. Used as the Container App name."
+        },
+        "dockerfile": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Path to the worker's Dockerfile relative to the project root."
+        }
+      },
+      "required": [
+        "name",
+        "dockerfile"
+      ],
+      "additionalProperties": {}
     }
   }
 }