From 14ec42474cc6d85e77a13d86ca5f83438be07b60 Mon Sep 17 00:00:00 2001 From: Mike Vu Date: Wed, 4 May 2022 20:08:29 -0700 Subject: [PATCH] Correct Probe enums (#18839) * fix probe enums * Fix revision mode enum * Fix patch example --- .../2022-01-01-preview/CommonDefinitions.json | 16 ++++++++++++---- .../2022-01-01-preview/ContainerApps.json | 4 ++-- .../examples/ContainerApps_CreateOrUpdate.json | 6 +++--- .../stable/2022-03-01/CommonDefinitions.json | 16 ++++++++++++---- .../stable/2022-03-01/ContainerApps.json | 4 ++-- .../examples/ContainerApps_CreateOrUpdate.json | 6 +++--- .../2022-03-01/examples/ContainerApps_Patch.json | 2 +- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json index d74fb9991175..1812e9d32be9 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json @@ -172,7 +172,15 @@ }, "scheme": { "description": "Scheme to use for connecting to the host. Defaults to HTTP.", - "type": "string" + "enum": [ + "HTTP", + "HTTPS" + ], + "type": "string", + "x-ms-enum": { + "name": "Scheme", + "modelAsString": true + } } } }, @@ -222,9 +230,9 @@ "type": { "description": "The type of probe.", "enum": [ - "liveness", - "readiness", - "startup" + "Liveness", + "Readiness", + "Startup" ], "type": "string", "x-ms-enum": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 4ddf1ed27cb1..4aff2475e7ab 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -427,8 +427,8 @@ "activeRevisionsMode": { "description": "ActiveRevisionsMode controls how active revisions are handled for the Container app:\nMultiple: multiple revisions can be active. If no value if provided, this is the defaultSingle: Only one revision can be active at a time. Revision weights can not be used in this mode", "enum": [ - "multiple", - "single" + "Multiple", + "Single" ], "type": "string", "x-ms-enum": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json index a3361fe80a45..a956f82ab4b8 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -38,7 +38,7 @@ "name": "testcontainerApp0", "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, @@ -122,7 +122,7 @@ }, "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, @@ -192,7 +192,7 @@ }, "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json index 169dde52642d..8dc19cfa4c1c 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json @@ -172,7 +172,15 @@ }, "scheme": { "description": "Scheme to use for connecting to the host. Defaults to HTTP.", - "type": "string" + "enum": [ + "HTTP", + "HTTPS" + ], + "type": "string", + "x-ms-enum": { + "name": "Scheme", + "modelAsString": true + } } } }, @@ -222,9 +230,9 @@ "type": { "description": "The type of probe.", "enum": [ - "liveness", - "readiness", - "startup" + "Liveness", + "Readiness", + "Startup" ], "type": "string", "x-ms-enum": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json index 080cb2828930..a1780db0be48 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json @@ -425,8 +425,8 @@ "activeRevisionsMode": { "description": "ActiveRevisionsMode controls how active revisions are handled for the Container app:\nMultiple: multiple revisions can be active.Single: Only one revision can be active at a time. Revision weights can not be used in this mode. If no value if provided, this is the default.", "enum": [ - "multiple", - "single" + "Multiple", + "Single" ], "type": "string", "x-ms-enum": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_CreateOrUpdate.json index f31bfa2e64d5..6c6228b39881 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_CreateOrUpdate.json @@ -45,7 +45,7 @@ "name": "testcontainerApp0", "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, @@ -140,7 +140,7 @@ }, "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, @@ -221,7 +221,7 @@ }, "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080, diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json index 96736f870fd9..398a79ea3ccc 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json @@ -48,7 +48,7 @@ "name": "testcontainerApp0", "probes": [ { - "type": "liveness", + "type": "Liveness", "httpGet": { "path": "/health", "port": 8080,