Skip to content

Commit d6b451a

Browse files
authored
Merge pull request #2085 from Azure/autogenerate
Merge Autogenerate
2 parents 1569e6a + 64f3fe7 commit d6b451a

26 files changed

+33139
-190
lines changed

generator/resources.json

Lines changed: 243 additions & 98 deletions
Large diffs are not rendered by default.

onboarded-report/result.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,12 @@
619619
"missing": [],
620620
"onboarded": []
621621
},
622+
{
623+
"basePath": "loadtestservice/resource-manager",
624+
"onboardedToAutogen": "yes",
625+
"missing": [],
626+
"onboarded": []
627+
},
622628
{
623629
"basePath": "logic/resource-manager",
624630
"onboardedToAutogen": "no",
@@ -811,6 +817,12 @@
811817
],
812818
"onboarded": []
813819
},
820+
{
821+
"basePath": "orbital/resource-manager",
822+
"onboardedToAutogen": "yes",
823+
"missing": [],
824+
"onboarded": []
825+
},
814826
{
815827
"basePath": "peering/resource-manager",
816828
"onboardedToAutogen": "yes",
@@ -1067,6 +1079,12 @@
10671079
"missing": [],
10681080
"onboarded": []
10691081
},
1082+
{
1083+
"basePath": "solutions/resource-manager",
1084+
"onboardedToAutogen": "yes",
1085+
"missing": [],
1086+
"onboarded": []
1087+
},
10701088
{
10711089
"basePath": "sql/resource-manager",
10721090
"onboardedToAutogen": "yes",

schemas/2014-04-01/Microsoft.Sql.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
"type": "array",
3737
"items": {
3838
"oneOf": [
39-
{
40-
"$ref": "#/definitions/servers_connectionPolicies_childResource"
41-
},
4239
{
4340
"$ref": "#/definitions/servers_databases_childResource"
4441
},
@@ -48,6 +45,9 @@
4845
{
4946
"$ref": "#/definitions/servers_communicationLinks_childResource"
5047
},
48+
{
49+
"$ref": "#/definitions/servers_connectionPolicies_childResource"
50+
},
5151
{
5252
"$ref": "#/definitions/servers_firewallRules_childResource"
5353
},

schemas/2018-06-01/Microsoft.DataFactory.json

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8740,6 +8740,22 @@
87408740
"properties": {},
87418741
"description": "Reference data flow parameters from dataset."
87428742
},
8743+
"parameters": {
8744+
"oneOf": [
8745+
{
8746+
"type": "object",
8747+
"additionalProperties": {
8748+
"type": "object",
8749+
"properties": {}
8750+
},
8751+
"properties": {}
8752+
},
8753+
{
8754+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
8755+
}
8756+
],
8757+
"description": "An object mapping parameter names to argument values."
8758+
},
87438759
"referenceName": {
87448760
"type": "string",
87458761
"description": "Reference data flow name."
@@ -12927,22 +12943,6 @@
1292712943
"Flowlet": {
1292812944
"type": "object",
1292912945
"properties": {
12930-
"additionalProperties": {
12931-
"oneOf": [
12932-
{
12933-
"type": "object",
12934-
"additionalProperties": {
12935-
"type": "object",
12936-
"properties": {}
12937-
},
12938-
"properties": {}
12939-
},
12940-
{
12941-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
12942-
}
12943-
],
12944-
"description": "Unmatched properties from the message are deserialized this collection"
12945-
},
1294612946
"type": {
1294712947
"type": "string",
1294812948
"enum": [
@@ -12969,10 +12969,6 @@
1296912969
"FlowletTypeProperties": {
1297012970
"type": "object",
1297112971
"properties": {
12972-
"additionalProperties": {
12973-
"type": "object",
12974-
"properties": {}
12975-
},
1297612972
"script": {
1297712973
"type": "string",
1297812974
"description": "Flowlet script."
@@ -13165,6 +13161,11 @@
1316513161
"properties": {},
1316613162
"description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)."
1316713163
},
13164+
"disableChunking": {
13165+
"type": "object",
13166+
"properties": {},
13167+
"description": "If true, disable parallel reading within each file. Default is false. Type: boolean (or Expression with resultType boolean)."
13168+
},
1316813169
"enablePartitionDiscovery": {
1316913170
"oneOf": [
1317013171
{
@@ -25101,6 +25102,11 @@
2510125102
"properties": {},
2510225103
"description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)."
2510325104
},
25105+
"disableChunking": {
25106+
"type": "object",
25107+
"properties": {},
25108+
"description": "If true, disable parallel reading within each file. Default is false. Type: boolean (or Expression with resultType boolean)."
25109+
},
2510425110
"enablePartitionDiscovery": {
2510525111
"oneOf": [
2510625112
{

schemas/2019-08-01/tenantDeploymentTemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,9 @@
610610
{
611611
"$ref": "https://schema.management.azure.com/schemas/2020-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/promotions"
612612
},
613+
{
614+
"$ref": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingSubscriptionAliases"
615+
},
613616
{
614617
"$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.Capacity.json#/tenant_resourceDefinitions/reservationOrders"
615618
},

schemas/2020-03-01-preview/Microsoft.Confluent.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -204,29 +204,6 @@
204204
"maxLength": 50,
205205
"description": "Publisher Id"
206206
},
207-
"status": {
208-
"oneOf": [
209-
{
210-
"type": "string",
211-
"enum": [
212-
"Started",
213-
"PendingFulfillmentStart",
214-
"InProgress",
215-
"Subscribed",
216-
"Suspended",
217-
"Reinstated",
218-
"Succeeded",
219-
"Failed",
220-
"Unsubscribed",
221-
"Updating"
222-
]
223-
},
224-
{
225-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
226-
}
227-
],
228-
"description": "SaaS Offer Status."
229-
},
230207
"termUnit": {
231208
"type": "string",
232209
"maxLength": 25,

0 commit comments

Comments
 (0)