schema: allow the "type" property for composable images

pjcdawkins · pjcdawkins · commit 0208181b7419 · 2025-07-15T13:09:05.000+01:00
diff --git a/validator/schema/upsun.json b/validator/schema/upsun.json
@@ -712,7 +712,7 @@
             "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"
           }
         },
-        "oneOf": [
+        "anyOf": [
           {
             "required": [
               "type"
@@ -722,6 +722,12 @@
             "required": [
               "stack"
             ]
+          },
+          {
+            "required": [
+              "type",
+              "stack"
+            ]
           }
         ],
         "additionalProperties": false
diff --git a/validator/validator_test.go b/validator/validator_test.go
@@ -171,7 +171,7 @@ services:
 						Data: []byte(`
 applications:
   app1:
-    type: "python:3.11"
+    type: "composable:25.05"
     stack:
       - "php@8.3":
         extensions:
@@ -195,7 +195,7 @@ services:
 					},
 				},
 			},
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "true-boolean",

Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@`
`712`	`712`	`"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"`
`713`	`713`	`}`
`714`	`714`	`},`
`715`		`- "oneOf": [`
	`715`	`+ "anyOf": [`
`716`	`716`	`{`
`717`	`717`	`"required": [`
`718`	`718`	`"type"`
`@@ -722,6 +722,12 @@`
`722`	`722`	`"required": [`
`723`	`723`	`"stack"`
`724`	`724`	`]`
	`725`	`+ },`
	`726`	`+ {`
	`727`	`+ "required": [`
	`728`	`+ "type",`
	`729`	`+ "stack"`
	`730`	`+ ]`
`725`	`731`	`}`
`726`	`732`	`],`
`727`	`733`	`"additionalProperties": false`