From e8c178dbdd3fd216a888e808d98675d5b8973be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Koen=20Fran=C3=A7ois?= <koen.francois@hotmail.com>
Date: Mon, 13 Dec 2021 02:20:20 +0100
Subject: [PATCH] Fix properties in deploy schema that require oneOf

Use `oneOf` instead of `"type": ["a", "b"]` to fix the `ng deploy` command
---
 src/schematics/deploy/schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/schematics/deploy/schema.json b/src/schematics/deploy/schema.json
index 2e3e551ef..ebe71c198 100644
--- a/src/schematics/deploy/schema.json
+++ b/src/schematics/deploy/schema.json
@@ -30,7 +30,7 @@
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "ssr": {
-      "type": ["boolean", "string"],
+      "oneOf": [{ "type": "boolean" }, { "type": "string" }],
       "description": "Should we attempt to deploy the function to Cloud Functions (true or 'cloud-functions') / Cloud Run ('cloud-run') or just Hosting (false)"
     },
     "prerender": {
@@ -54,7 +54,7 @@
       "description": "The name of the Cloud Function or Cloud Run serviceId to deploy SSR to"
     },
     "functionsNodeVersion": {
-      "type": ["number", "string"],
+      "oneOf": [{ "type": "number" }, { "type": "string" }],
       "description": "Version of Node.js to run Cloud Functions / Run on"
     },
     "region": {
@@ -82,12 +82,12 @@
           "description": "Set a CPU limit in Kubernetes cpu units."
         },
         "maxConcurrency": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "Set the maximum number of concurrent requests allowed per container instance. If concurrency is unspecified, any number of concurrent requests are allowed. To unset this field, provide the special value default."
         },
         "maxInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The maximum number of container instances of the Service to run. Use 'default' to unset the limit and use the platform default."
         },
@@ -97,7 +97,7 @@
           "description": "Set a memory limit. Ex: 1Gi, 512Mi."
         },
         "minInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The minimum number of container instances of the Service to run or 'default' to remove any minimum."
         },