diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json index d6d7266542..8b542e8452 100644 --- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json @@ -339,7 +339,8 @@ "httpsOnly": { "oneOf": [ { - "type": "boolean" + "type": "boolean", + "default": false }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" diff --git a/schemas/2020-07-01/Microsoft.AppPlatform.json b/schemas/2020-07-01/Microsoft.AppPlatform.json index 9eeb103575..2b0b7e60cc 100644 --- a/schemas/2020-07-01/Microsoft.AppPlatform.json +++ b/schemas/2020-07-01/Microsoft.AppPlatform.json @@ -437,7 +437,8 @@ "httpsOnly": { "oneOf": [ { - "type": "boolean" + "type": "boolean", + "default": false }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" diff --git a/schemas/2020-11-01-preview/Microsoft.AppPlatform.json b/schemas/2020-11-01-preview/Microsoft.AppPlatform.json index 10978c251e..de4239b1b5 100644 --- a/schemas/2020-11-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2020-11-01-preview/Microsoft.AppPlatform.json @@ -438,7 +438,8 @@ "enableEndToEndTLS": { "oneOf": [ { - "type": "boolean" + "type": "boolean", + "default": false }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -453,7 +454,8 @@ "httpsOnly": { "oneOf": [ { - "type": "boolean" + "type": "boolean", + "default": false }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" diff --git a/schemas/2021-03-03-preview/Microsoft.AppPlatform.json b/schemas/2021-06-01-preview/Microsoft.AppPlatform.json similarity index 92% rename from schemas/2021-03-03-preview/Microsoft.AppPlatform.json rename to schemas/2021-06-01-preview/Microsoft.AppPlatform.json index 86b1082a06..ed0c4fa392 100644 --- a/schemas/2021-03-03-preview/Microsoft.AppPlatform.json +++ b/schemas/2021-06-01-preview/Microsoft.AppPlatform.json @@ -1,5 +1,5 @@ { - "id": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#", + "id": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#", "$schema": "http://json-schema.org/draft-04/schema#", "title": "Microsoft.AppPlatform", "description": "Microsoft AppPlatform Resource Types", @@ -10,7 +10,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "location": { @@ -98,7 +98,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "identity": { @@ -168,7 +168,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -207,7 +207,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -257,7 +257,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -296,7 +296,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -335,7 +335,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -381,7 +381,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -687,6 +687,59 @@ }, "description": "The settings of config server." }, + "CustomContainer": { + "type": "object", + "properties": { + "args": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Arguments to the entrypoint. The docker image's CMD is used if this is not provided." + }, + "command": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Entrypoint array. Not executed within a shell. The docker image's ENTRYPOINT is used if this is not provided." + }, + "containerImage": { + "type": "string", + "description": "Container image of the custom container. This should be in the form of : without the server name of the registry" + }, + "imageRegistryCredential": { + "oneOf": [ + { + "$ref": "#/definitions/ImageRegistryCredential" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Credential of the image registry" + }, + "server": { + "type": "string", + "description": "The name of the registry that contains the container image" + } + }, + "description": "Custom container payload" + }, "CustomDomainProperties": { "type": "object", "properties": { @@ -742,7 +795,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Required CPU. This should be 1 for Basic tier, and in range [1, 4] for Standard tier. This is deprecated starting from API version 2020-03-03-preview. Please use the resourceRequests field to set the CPU size." + "description": "Required CPU. This should be 1 for Basic tier, and in range [1, 4] for Standard tier. This is deprecated starting from API version 2021-06-01-preview. Please use the resourceRequests field to set the CPU size." }, "environmentVariables": { "oneOf": [ @@ -773,7 +826,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Required Memory size in GB. This should be in range [1, 2] for Basic tier, and in range [1, 8] for Standard tier. This is deprecated starting from API version 2020-03-03-preview. Please use the resourceRequests field to set the the memory size." + "description": "Required Memory size in GB. This should be in range [1, 2] for Basic tier, and in range [1, 8] for Standard tier. This is deprecated starting from API version 2021-06-01-preview. Please use the resourceRequests field to set the the memory size." }, "netCoreMainEntryPath": { "type": "string", @@ -904,6 +957,20 @@ ], "description": "Git repository property payload" }, + "ImageRegistryCredential": { + "type": "object", + "properties": { + "password": { + "type": "string", + "description": "The password of the image registry credential" + }, + "username": { + "type": "string", + "description": "The username of the image registry credential" + } + }, + "description": "Credential of the image registry" + }, "ManagedIdentityProperties": { "type": "object", "properties": { @@ -986,7 +1053,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "Indicates whether enable the trace functionality, which will be deprecated since api version 2021-03-03-preview. Please leverage appInsightsInstrumentationKey to indicate if monitoringSettings enabled or not" + "description": "Indicates whether enable the trace functionality, which will be deprecated since api version 2020-11-01-preview. Please leverage appInsightsInstrumentationKey to indicate if monitoringSettings enabled or not" } }, "description": "Monitoring Setting properties payload" @@ -1087,7 +1154,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1126,7 +1193,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "identity": { @@ -1180,7 +1247,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1230,7 +1297,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1269,7 +1336,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1308,7 +1375,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1349,7 +1416,7 @@ "apiVersion": { "type": "string", "enum": [ - "2021-03-03-preview" + "2021-06-01-preview" ] }, "name": { @@ -1414,6 +1481,17 @@ "type": "string", "description": "Selector for the artifact to be used for the deployment for multi-module projects. This should be\r\nthe relative path to the target module/project." }, + "customContainer": { + "oneOf": [ + { + "$ref": "#/definitions/CustomContainer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Custom container payload" + }, "relativePath": { "type": "string", "description": "Relative path of the storage which stores the source" @@ -1425,7 +1503,8 @@ "enum": [ "Jar", "NetCoreZip", - "Source" + "Source", + "Container" ] }, { diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 155dd30ac7..bbac8b02b7 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -1466,28 +1466,28 @@ "$ref": "https://schema.management.azure.com/schemas/2020-11-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_monitoringSettings" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_bindings" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_bindings" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_deployments" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_deployments" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_domains" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_apps_domains" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_certificates" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_certificates" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_configServers" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_configServers" }, { - "$ref": "https://schema.management.azure.com/schemas/2021-03-03-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_monitoringSettings" + "$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.AppPlatform.json#/resourceDefinitions/Spring_monitoringSettings" }, { "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Attestation.json#/resourceDefinitions/attestationProviders"