Skip to content

Commit

Permalink
Merge pull request #1433 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Merge Autogenerate
  • Loading branch information
jorgecotillo authored Dec 18, 2020
2 parents e19a420 + 7eafab8 commit c8a2a21
Show file tree
Hide file tree
Showing 20 changed files with 5,231 additions and 781 deletions.
123 changes: 94 additions & 29 deletions generator/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"2020-01-01"
],
"Microsoft.AVS/privateClouds": [
"2019-08-09-preview",
"2020-03-20",
"2020-07-17-preview"
],
Expand All @@ -14,7 +13,6 @@
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/clusters": [
"2019-08-09-preview",
"2020-03-20",
"2020-07-17-preview"
],
Expand Down Expand Up @@ -893,7 +891,8 @@
"2019-04-01"
],
"Microsoft.Capacity/resourceProviders/locations/serviceLimits": [
"2019-07-19-preview"
"2019-07-19-preview",
"2020-10-25"
],
"Microsoft.Cdn/CdnWebApplicationFirewallPolicies": [
"2019-06-15",
Expand Down Expand Up @@ -1770,11 +1769,16 @@
],
"Microsoft.DigitalTwins/digitalTwinsInstances": [
"2020-03-01-preview",
"2020-10-31"
"2020-10-31",
"2020-12-01"
],
"Microsoft.DigitalTwins/digitalTwinsInstances/endpoints": [
"2020-03-01-preview",
"2020-10-31"
"2020-10-31",
"2020-12-01"
],
"Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections": [
"2020-12-01"
],
"Microsoft.DocumentDB/databaseAccounts": [
"2015-04-01",
Expand Down Expand Up @@ -2199,7 +2203,7 @@
"2018-10-31-preview"
],
"Microsoft.HealthBot/healthBots": [
"2020-10-20-preview"
"2020-12-08"
],
"Microsoft.HealthcareApis/services": [
"2018-08-20-preview",
Expand Down Expand Up @@ -2705,12 +2709,14 @@
"2020-02-01",
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/backupPolicies": [
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/capacityPools": [
"2017-08-15",
Expand All @@ -2723,7 +2729,8 @@
"2020-02-01",
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
"2017-08-15",
Expand All @@ -2736,12 +2743,14 @@
"2020-02-01",
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
"2017-08-15",
Expand All @@ -2754,12 +2763,14 @@
"2020-02-01",
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
"2020-06-01",
"2020-07-01",
"2020-08-01"
"2020-08-01",
"2020-09-01"
],
"Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
"2018-12-01",
Expand Down Expand Up @@ -4068,6 +4079,12 @@
"2020-08-01",
"2020-10-01"
],
"Microsoft.OperationalInsights/queryPacks": [
"2019-09-01-preview"
],
"Microsoft.OperationalInsights/queryPacks/queries": [
"2019-09-01-preview"
],
"Microsoft.OperationalInsights/workspaces": [
"2015-11-01-preview",
"2020-03-01-preview",
Expand Down Expand Up @@ -4377,30 +4394,68 @@
],
"Microsoft.Security/advancedThreatProtectionSettings": [
"2017-08-01-preview",
"2018-06-01"
"2019-01-01"
],
"Microsoft.Security/alertsSuppressionRules": [
"2019-01-01-preview"
],
"Microsoft.Security/assessmentMetadata": [
"2019-01-01-preview",
"2020-01-01"
],
"Microsoft.Security/assessments": [
"2019-01-01-preview",
"2020-01-01"
],
"Microsoft.Security/autoProvisioningSettings": [
"2017-08-01-preview"
],
"Microsoft.Security/automations": [
"2019-01-01-preview"
],
"Microsoft.Security/connectors": [
"2020-01-01-preview"
],
"Microsoft.Security/deviceSecurityGroups": [
"2017-08-01-preview",
"2018-06-01"
"2019-08-01"
],
"Microsoft.Security/informationProtectionPolicies": [
"2017-08-01-preview"
],
"Microsoft.Security/iotDefenderSettings": [
"2020-08-06-preview"
],
"Microsoft.Security/iotSecuritySolutions": [
"2017-08-01-preview",
"2018-06-01"
"2019-08-01"
],
"Microsoft.Security/iotSensors": [
"2020-08-06-preview"
],
"Microsoft.Security/locations/applicationWhitelistings": [
"2015-06-01-preview",
"2020-01-01"
],
"Microsoft.Security/locations/jitNetworkAccessPolicies": [
"2015-06-01-preview"
"2015-06-01-preview",
"2020-01-01"
],
"Microsoft.Security/pricings": [
"2017-08-01-preview",
"2017-08-01-preview",
"2018-06-01"
],
"Microsoft.Security/securityContacts": [
"2017-08-01-preview",
"2018-06-01"
"2020-01-01-preview"
],
"Microsoft.Security/workspaceSettings": [
"Microsoft.Security/settings": [
"2017-08-01-preview",
"2018-06-01"
"2019-01-01"
],
"Microsoft.Security/workspaceSettings": [
"2017-08-01-preview"
],
"Microsoft.ServiceBus/namespaces": [
"2015-08-01",
Expand All @@ -4409,16 +4464,19 @@
],
"Microsoft.ServiceBus/namespaces/AuthorizationRules": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs": [
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/ipfilterrules": [
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/migrationConfigurations": [
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/networkRuleSets": [
"2017-04-01",
Expand All @@ -4429,26 +4487,32 @@
],
"Microsoft.ServiceBus/namespaces/queues": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/queues/authorizationRules": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/topics": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/topics/authorizationRules": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/topics/subscriptions": [
"2015-08-01",
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/topics/subscriptions/rules": [
"2017-04-01"
"2017-04-01",
"2018-01-01-preview"
],
"Microsoft.ServiceBus/namespaces/virtualnetworkrules": [
"2018-01-01-preview"
Expand Down Expand Up @@ -4631,6 +4695,7 @@
"2017-03-01-preview",
"2017-10-01-preview",
"2019-06-01-preview",
"2020-02-02-preview",
"2020-08-01-preview"
],
"Microsoft.Sql/servers/databases/advisors": [
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 @@ -1887,7 +1887,7 @@
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_topics_subscriptions_rules" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_ipfilterrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkrulesets" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkRuleSets" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_virtualnetworkrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account_extension" },
Expand Down
2 changes: 1 addition & 1 deletion schemas/2015-01-01/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_topics_subscriptions_rules" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_ipfilterrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkrulesets" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkRuleSets" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_virtualnetworkrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account_extension" },
Expand Down
57 changes: 0 additions & 57 deletions schemas/2017-06-01/Microsoft.AAD.json
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,6 @@
],
"description": "Secure LDAP Settings"
},
"migrationProperties": {
"oneOf": [
{
"$ref": "#/definitions/MigrationProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Migration Properties"
},
"notificationSettings": {
"oneOf": [
{
Expand Down Expand Up @@ -399,52 +388,6 @@
},
"description": "Secure LDAP Settings"
},
"MigrationProgress": {
"type": "object",
"properties": {
"completionPercentage": {
"oneOf": [
{
"type": "number"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Completion Percentage"
},
"progressMessage": {
"type": "string",
"description": "Progress Message"
}
},
"description": "Migration Progress"
},
"MigrationProperties": {
"type": "object",
"properties": {
"migrationProgress": {
"oneOf": [
{
"$ref": "#/definitions/MigrationProgress"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Migration Progress"
},
"oldSubnetId": {
"type": "string",
"description": "Old Subnet Id"
},
"oldVnetSiteId": {
"type": "string",
"description": "Old Vnet Site Id"
}
},
"description": "Migration Properties"
},
"NotificationSettings": {
"type": "object",
"properties": {
Expand Down
Loading

0 comments on commit c8a2a21

Please sign in to comment.