Skip to content

Commit

Permalink
Merge pull request #1453 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Merge Autogenerate
  • Loading branch information
jorgecotillo authored Jan 8, 2021
2 parents 55af2a6 + f2ff5da commit 2533c6d
Show file tree
Hide file tree
Showing 67 changed files with 6,296 additions and 171 deletions.
57 changes: 39 additions & 18 deletions generator/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"2020-03-20",
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/addons": [
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/authorizations": [
"2020-03-20",
"2020-07-17-preview"
Expand Down Expand Up @@ -495,7 +498,8 @@
"2020-06-01-preview"
],
"Microsoft.ApiManagement/service/tenant": [
"2016-10-10"
"2016-10-10",
"2020-06-01-preview"
],
"Microsoft.ApiManagement/service/users": [
"2016-07-07",
Expand All @@ -520,33 +524,41 @@
],
"Microsoft.AppPlatform/Spring": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/apps": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/apps/bindings": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/apps/deployments": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/apps/domains": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/certificates": [
"2019-05-01-preview",
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/configServers": [
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.AppPlatform/Spring/monitoringSettings": [
"2020-07-01"
"2020-07-01",
"2020-11-01-preview"
],
"Microsoft.Attestation/attestationProviders": [
"2018-09-01-preview",
Expand Down Expand Up @@ -1205,7 +1217,8 @@
"2020-06-01",
"2020-07-01",
"2020-09-01",
"2020-11-01"
"2020-11-01",
"2020-12-01"
],
"Microsoft.ContainerService/managedClusters/agentPools": [
"2019-02-01",
Expand All @@ -1221,13 +1234,18 @@
"2020-06-01",
"2020-07-01",
"2020-09-01",
"2020-11-01"
"2020-11-01",
"2020-12-01"
],
"Microsoft.ContainerService/managedClusters/maintenanceConfigurations": [
"2020-12-01"
],
"Microsoft.ContainerService/managedClusters/privateEndpointConnections": [
"2020-06-01",
"2020-07-01",
"2020-09-01",
"2020-11-01"
"2020-11-01",
"2020-12-01"
],
"Microsoft.ContainerService/openShiftManagedClusters": [
"2018-09-30-preview",
Expand Down Expand Up @@ -1262,7 +1280,7 @@
"2017-12-01",
"2017-12-01-preview"
],
"Microsoft.DBForMySQL/servers/Administrators": [
"Microsoft.DBForMySQL/servers/administrators": [
"2017-12-01",
"2017-12-01-preview"
],
Expand All @@ -1286,7 +1304,7 @@
"2017-12-01",
"2017-12-01-preview"
],
"Microsoft.DBForPostgreSQL/servers/Administrators": [
"Microsoft.DBForPostgreSQL/servers/administrators": [
"2017-12-01",
"2017-12-01-preview"
],
Expand Down Expand Up @@ -1604,7 +1622,8 @@
"2020-11-02-preview"
],
"Microsoft.DevOps/pipelines": [
"2019-07-01-preview"
"2019-07-01-preview",
"2020-07-13-preview"
],
"Microsoft.DevSpaces/controllers": [
"2019-04-01"
Expand Down Expand Up @@ -2343,7 +2362,7 @@
"Microsoft.Intune/locations/iosPolicies/groups": [
"2015-01-14-preview"
],
"Microsoft.IoTCentral/IoTApps": [
"Microsoft.IoTCentral/iotApps": [
"2018-09-01"
],
"Microsoft.IoTSpaces/Graph": [
Expand Down Expand Up @@ -4987,12 +5006,14 @@
"Microsoft.StorageCache/caches": [
"2019-08-01-preview",
"2019-11-01",
"2020-03-01"
"2020-03-01",
"2020-10-01"
],
"Microsoft.StorageCache/caches/storageTargets": [
"2019-08-01-preview",
"2019-11-01",
"2020-03-01"
"2020-03-01",
"2020-10-01"
],
"Microsoft.StorageSync/storageSyncServices": [
"2017-06-05-preview",
Expand Down
2 changes: 1 addition & 1 deletion schemas/2014-04-01-preview/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -1764,7 +1764,7 @@
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images_versions" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/IoTApps" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/iotApps" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces_clusters" },
Expand Down
6 changes: 3 additions & 3 deletions schemas/2015-01-01/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -902,14 +902,14 @@
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_administrators" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_firewallRules" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_Administrators" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_administrators" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_configurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_databases" },
Expand Down Expand Up @@ -1903,7 +1903,7 @@
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images_versions" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/IoTApps" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/iotApps" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces_clusters" },
Expand Down
2 changes: 1 addition & 1 deletion schemas/2015-10-31/Microsoft.Automation.json
Original file line number Diff line number Diff line change
Expand Up @@ -2801,4 +2801,4 @@
"description": "The properties of the create webhook operation."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-02-03/Microsoft.Devices.json
Original file line number Diff line number Diff line change
Expand Up @@ -542,4 +542,4 @@
"description": "The properties of the Azure Storage endpoint for file upload."
}
}
}
}
38 changes: 38 additions & 0 deletions schemas/2016-05-16/Microsoft.AnalysisServices.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,51 @@
"backupBlobContainerUri": {
"type": "string",
"description": "The container URI of backup blob."
},
"managedMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
},
"serverMonitorMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The server monitor mode for AS server"
}
},
"description": "Properties of Analysis Services resource."
},
"ResourceSku": {
"type": "object",
"properties": {
"capacity": {
"oneOf": [
{
"type": "integer",
"minimum": 1,
"maximum": 8,
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The number of instances in the read only query pool."
},
"name": {
"type": "string",
"description": "Name of the SKU level."
Expand Down
2 changes: 1 addition & 1 deletion schemas/2017-01-19/Microsoft.Devices.json
Original file line number Diff line number Diff line change
Expand Up @@ -872,4 +872,4 @@
"description": "The properties of the Azure Storage endpoint for file upload."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2017-05-15-preview/Microsoft.Automation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1047,4 +1047,4 @@
"description": "Windows specific update configuration."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2017-07-01/Microsoft.Devices.json
Original file line number Diff line number Diff line change
Expand Up @@ -1047,4 +1047,4 @@
"description": "The properties of the Azure Storage endpoint for file upload."
}
}
}
}
24 changes: 24 additions & 0 deletions schemas/2017-07-14/Microsoft.AnalysisServices.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,30 @@
}
],
"description": "The gateway details."
},
"managedMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
},
"serverMonitorMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The server monitor mode for AS server"
}
},
"description": "Properties of Analysis Services resource."
Expand Down
35 changes: 35 additions & 0 deletions schemas/2017-08-01/Microsoft.AnalysisServices.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@
],
"description": "An array of firewall rules."
},
"managedMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
},
"querypoolConnectionMode": {
"oneOf": [
{
Expand All @@ -141,6 +153,29 @@
}
],
"description": "How the read-write server's participation in the query pool is controlled.<br/>It can have the following values: <ul><li>readOnly - indicates that the read-write server is intended not to participate in query operations</li><li>all - indicates that the read-write server can participate in query operations</li></ul>Specifying readOnly when capacity is 1 results in error."
},
"serverMonitorMode": {
"oneOf": [
{
"type": "integer",
"default": "1"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The server monitor mode for AS server"
},
"sku": {
"oneOf": [
{
"$ref": "#/definitions/ResourceSku"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Represents the SKU name and Azure pricing tier for Analysis Services resource."
}
},
"description": "Properties of Analysis Services resource."
Expand Down
Loading

0 comments on commit 2533c6d

Please sign in to comment.