Add support for composable images when validating configs

platformsh · Jul 19, 2024 · 3191ebd · 3191ebd
1 parent 2ddf43f
commit 3191ebd
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 5 deletions.
diff --git a/validator/schema/platformsh.application.json b/validator/schema/platformsh.application.json
@@ -888,11 +888,44 @@
         "type": "string"
       },
       "title": "Resolve additional IPs to domain names."
+    },
+    "stack": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "object"
+        },
+        {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "object"
+              }
+            ]
+          }
+        }
+      ]
     }
   },
-  "required": [
-    "name",
-    "type"
+  "oneOf": [
+    {
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    {
+      "required": [
+        "name",
+        "stack"
+      ]
+    }
   ],
   "additionalProperties": false
 }
diff --git a/validator/schema/upsun.json b/validator/schema/upsun.json
@@ -875,10 +875,42 @@
               "type": "string"
             },
             "title": "Resolve additional IPs to domain names."
+          },
+          "stack": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "object"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "object"
+                    }
+                  ]
+                }
+              }
+            ]
           }
         },
-        "required": [
-          "type"
+        "oneOf": [
+          {
+            "required": [
+              "type"
+            ]
+          },
+          {
+            "required": [
+              "stack"
+            ]
+          }
         ],
         "additionalProperties": false
       }

diff --git a/validator/validator_test.go b/validator/validator_test.go
@@ -127,6 +127,73 @@ services:
 			},
 			wantErr: false,
 		},
+		{
+			name: "stack",
+			args: args{
+				path: fstest.MapFS{
+					".upsun/config.yaml": &fstest.MapFile{
+						Data: []byte(`
+applications:
+  app1:
+    stack:
+      - "[email protected]":
+        extensions:
+          - apcu
+          - sodium
+          - xsl
+          - pdo_sqlite
+      - "nodejs@20"
+      - "[email protected]"
+`,
+						),
+					},
+					".upsun/services.yaml": &fstest.MapFile{
+						Data: []byte(`
+services:
+  redis:
+    type: redis:6.2
+    size: AUTO
+`,
+						),
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "stack-and-type",
+			args: args{
+				path: fstest.MapFS{
+					".upsun/config.yaml": &fstest.MapFile{
+						Data: []byte(`
+applications:
+  app1:
+    type: "python:3.11"
+    stack:
+      - "[email protected]":
+        extensions:
+          - apcu
+          - sodium
+          - xsl
+          - pdo_sqlite
+      - "nodejs@20"
+      - "[email protected]"
+`,
+						),
+					},
+					".upsun/services.yaml": &fstest.MapFile{
+						Data: []byte(`
+services:
+  redis:
+    type: redis:6.2
+    size: AUTO
+`,
+						),
+					},
+				},
+			},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {