schema: allow the "type" property for composable images

Author: pjcdawkins

validator/schema/upsun.json

@@ -42,8 +42,8 @@
           "firewall": {"$ref": "#/definitions/firewall"},
           "type": {
             "type": "string",
-            "title": "The base runtime (language) and version to use for this application",
-            "description": "The base image to use with a specific app language.  \nFormat: runtime:version. \nMore information: \nhttps://docs.upsun.com/create-apps/app-reference/single-runtime-image.html#types"
+            "title": "The base runtime and version to use for this application",
+            "description": "The base image to use.  \nFormat: runtime:version. \nMore information: \nhttps://docs.upsun.com/create-apps/app-reference/single-runtime-image.html#types"
           },
           "runtime": {
             "type": "object",
@@ -705,14 +705,14 @@
                       "type": "object"
                     }
                   ]
-                }
+                },
+                "description": "A package definition, for example 'package@version' (for services) or just 'package' (for tools)."
               }
             ],
             "title": "Composable Image definition",
-            "description": "A list of packages from the Upsun collection of supported runtimes and/or from NixPkgs.  \nMore information: \nhttps://docs.upsun.com/create-apps/app-reference/composable-image.html"
-          }
+            "description": "A list of Nix packages from NixPkgs.  \nMore information: \nhttps://docs.upsun.com/create-apps/app-reference/composable-image.html"          }
         },
-        "oneOf": [
+        "anyOf": [
           {
             "required": [
               "type"
@@ -722,6 +722,12 @@
             "required": [
               "stack"
             ]
+          },
+          {
+            "required": [
+              "type",
+              "stack"
+            ]
           }
         ],
         "additionalProperties": false

validator/validator_test.go

@@ -171,7 +171,7 @@ services:
 						Data: []byte(`
 applications:
   app1:
-    type: "python:3.11"
+    type: "composable:25.05"
     stack:
       - "[email protected]":
         extensions:
@@ -195,7 +195,7 @@ services:
 					},
 				},
 			},
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "true-boolean",