Skip to content

Commit 01575f4

Browse files
XynoclafeXynoclafe
authored
Merge pull request #2783 from Azure/autogenerate
Autogenerate
2 parents 78169fb + 5151126 commit 01575f4

File tree

15 files changed

+14917
-98
lines changed

15 files changed

+14917
-98
lines changed

‎generator/resources.json

Lines changed: 206 additions & 83 deletions
Large diffs are not rendered by default.

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

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2847,6 +2847,24 @@
28472847
"type": "string",
28482848
"description": "Specify the kind of your storage account. Allowed values are: Storage (general purpose v1), StorageV2 (general purpose v2), BlobStorage, or BlockBlobStorage. Type: string (or Expression with resultType string)."
28492849
},
2850+
"authenticationType": {
2851+
"oneOf": [
2852+
{
2853+
"type": "string",
2854+
"enum": [
2855+
"Anonymous",
2856+
"AccountKey",
2857+
"SasUri",
2858+
"ServicePrincipal",
2859+
"Msi"
2860+
]
2861+
},
2862+
{
2863+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2864+
}
2865+
],
2866+
"description": "The type used for authentication. Type: string."
2867+
},
28502868
"azureCloudType": {
28512869
"type": "object",
28522870
"properties": {},
@@ -2857,6 +2875,11 @@
28572875
"properties": {},
28582876
"description": "The connection string. It is mutually exclusive with sasUri, serviceEndpoint property. Type: string, SecureString or AzureKeyVaultSecretReference."
28592877
},
2878+
"containerUri": {
2879+
"type": "object",
2880+
"properties": {},
2881+
"description": "Container uri of the Azure Blob Storage resource only support for anonymous access. Type: string (or Expression with resultType string)."
2882+
},
28602883
"credential": {
28612884
"oneOf": [
28622885
{
@@ -7641,6 +7664,52 @@
76417664
],
76427665
"description": "Copy activity properties."
76437666
},
7667+
"CopyComputeScaleProperties": {
7668+
"type": "object",
7669+
"properties": {
7670+
"additionalProperties": {
7671+
"oneOf": [
7672+
{
7673+
"type": "object",
7674+
"additionalProperties": {
7675+
"type": "object",
7676+
"properties": {}
7677+
},
7678+
"properties": {}
7679+
},
7680+
{
7681+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7682+
}
7683+
],
7684+
"description": "Unmatched properties from the message are deserialized this collection"
7685+
},
7686+
"dataIntegrationUnit": {
7687+
"oneOf": [
7688+
{
7689+
"type": "integer",
7690+
"minimum": 4
7691+
},
7692+
{
7693+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7694+
}
7695+
],
7696+
"description": "DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256."
7697+
},
7698+
"timeToLive": {
7699+
"oneOf": [
7700+
{
7701+
"type": "integer",
7702+
"minimum": 5
7703+
},
7704+
{
7705+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7706+
}
7707+
],
7708+
"description": "Time to live (in minutes) setting of integration runtime which will execute copy activity."
7709+
}
7710+
},
7711+
"description": "CopyComputeScale properties for managed integration runtime."
7712+
},
76447713
"CopySink": {
76457714
"type": "object",
76467715
"oneOf": [
@@ -17236,6 +17305,17 @@
1723617305
],
1723717306
"description": "Unmatched properties from the message are deserialized this collection"
1723817307
},
17308+
"copyComputeScaleProperties": {
17309+
"oneOf": [
17310+
{
17311+
"$ref": "#/definitions/CopyComputeScaleProperties"
17312+
},
17313+
{
17314+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17315+
}
17316+
],
17317+
"description": "CopyComputeScale properties for managed integration runtime."
17318+
},
1723917319
"dataFlowProperties": {
1724017320
"oneOf": [
1724117321
{
@@ -17279,6 +17359,17 @@
1727917359
],
1728017360
"description": "The required number of nodes for managed integration runtime."
1728117361
},
17362+
"pipelineExternalComputeScaleProperties": {
17363+
"oneOf": [
17364+
{
17365+
"$ref": "#/definitions/PipelineExternalComputeScaleProperties"
17366+
},
17367+
{
17368+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17369+
}
17370+
],
17371+
"description": "PipelineExternalComputeScale properties for managed integration runtime."
17372+
},
1728217373
"vNetProperties": {
1728317374
"oneOf": [
1728417375
{
@@ -22364,6 +22455,40 @@
2236422455
},
2236522456
"description": "Pipeline ElapsedTime Metric Policy."
2236622457
},
22458+
"PipelineExternalComputeScaleProperties": {
22459+
"type": "object",
22460+
"properties": {
22461+
"additionalProperties": {
22462+
"oneOf": [
22463+
{
22464+
"type": "object",
22465+
"additionalProperties": {
22466+
"type": "object",
22467+
"properties": {}
22468+
},
22469+
"properties": {}
22470+
},
22471+
{
22472+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
22473+
}
22474+
],
22475+
"description": "Unmatched properties from the message are deserialized this collection"
22476+
},
22477+
"timeToLive": {
22478+
"oneOf": [
22479+
{
22480+
"type": "integer",
22481+
"minimum": 5
22482+
},
22483+
{
22484+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
22485+
}
22486+
],
22487+
"description": "Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity."
22488+
}
22489+
},
22490+
"description": "PipelineExternalComputeScale properties for managed integration runtime."
22491+
},
2236722492
"PipelineFolder": {
2236822493
"type": "object",
2236922494
"properties": {

‎schemas/2021-02-01-preview/Microsoft.Network.NRP.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,6 +1861,20 @@
18611861
],
18621862
"description": "Direction that specifies whether the access rules is inbound/outbound."
18631863
},
1864+
"emailAddresses": {
1865+
"oneOf": [
1866+
{
1867+
"type": "array",
1868+
"items": {
1869+
"type": "string"
1870+
}
1871+
},
1872+
{
1873+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1874+
}
1875+
],
1876+
"description": "Outbound rules email address format."
1877+
},
18641878
"fullyQualifiedDomainNames": {
18651879
"oneOf": [
18661880
{
@@ -1889,6 +1903,20 @@
18891903
],
18901904
"description": "Inbound rule specified by the perimeter id."
18911905
},
1906+
"phoneNumbers": {
1907+
"oneOf": [
1908+
{
1909+
"type": "array",
1910+
"items": {
1911+
"type": "string"
1912+
}
1913+
},
1914+
{
1915+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1916+
}
1917+
],
1918+
"description": "Outbound rules phone number format."
1919+
},
18921920
"subscriptions": {
18931921
"oneOf": [
18941922
{

‎schemas/2021-10-01/Microsoft.Compute.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@
816816
"enum": [
817817
"Standard_LRS",
818818
"Standard_ZRS",
819-
"Premium_LRS"
819+
"Premium_LRS",
820+
"StandardSSD_LRS"
820821
]
821822
},
822823
{
@@ -1218,7 +1219,8 @@
12181219
"enum": [
12191220
"Standard_LRS",
12201221
"Standard_ZRS",
1221-
"Premium_LRS"
1222+
"Premium_LRS",
1223+
"StandardSSD_LRS"
12221224
]
12231225
},
12241226
{
@@ -1423,7 +1425,8 @@
14231425
"enum": [
14241426
"Standard_LRS",
14251427
"Standard_ZRS",
1426-
"Premium_LRS"
1428+
"Premium_LRS",
1429+
"StandardSSD_LRS"
14271430
]
14281431
},
14291432
{
@@ -1640,7 +1643,8 @@
16401643
"enum": [
16411644
"Standard_LRS",
16421645
"Standard_ZRS",
1643-
"Premium_LRS"
1646+
"Premium_LRS",
1647+
"StandardSSD_LRS"
16441648
]
16451649
},
16461650
{

‎schemas/2022-01-03/Microsoft.Compute.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,8 @@
842842
"enum": [
843843
"Standard_LRS",
844844
"Standard_ZRS",
845-
"Premium_LRS"
845+
"Premium_LRS",
846+
"StandardSSD_LRS"
846847
]
847848
},
848849
{
@@ -1243,7 +1244,8 @@
12431244
"enum": [
12441245
"Standard_LRS",
12451246
"Standard_ZRS",
1246-
"Premium_LRS"
1247+
"Premium_LRS",
1248+
"StandardSSD_LRS"
12471249
]
12481250
},
12491251
{
@@ -1448,7 +1450,8 @@
14481450
"enum": [
14491451
"Standard_LRS",
14501452
"Standard_ZRS",
1451-
"Premium_LRS"
1453+
"Premium_LRS",
1454+
"StandardSSD_LRS"
14521455
]
14531456
},
14541457
{
@@ -1666,7 +1669,8 @@
16661669
"enum": [
16671670
"Standard_LRS",
16681671
"Standard_ZRS",
1669-
"Premium_LRS"
1672+
"Premium_LRS",
1673+
"StandardSSD_LRS"
16701674
]
16711675
},
16721676
{

‎schemas/2022-03-03/Microsoft.Compute.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,8 @@
965965
"enum": [
966966
"Standard_LRS",
967967
"Standard_ZRS",
968-
"Premium_LRS"
968+
"Premium_LRS",
969+
"StandardSSD_LRS"
969970
]
970971
},
971972
{
@@ -1412,7 +1413,8 @@
14121413
"enum": [
14131414
"Standard_LRS",
14141415
"Standard_ZRS",
1415-
"Premium_LRS"
1416+
"Premium_LRS",
1417+
"StandardSSD_LRS"
14161418
]
14171419
},
14181420
{
@@ -1634,7 +1636,8 @@
16341636
"enum": [
16351637
"Standard_LRS",
16361638
"Standard_ZRS",
1637-
"Premium_LRS"
1639+
"Premium_LRS",
1640+
"StandardSSD_LRS"
16381641
]
16391642
},
16401643
{
@@ -1863,7 +1866,8 @@
18631866
"enum": [
18641867
"Standard_LRS",
18651868
"Standard_ZRS",
1866-
"Premium_LRS"
1869+
"Premium_LRS",
1870+
"StandardSSD_LRS"
18671871
]
18681872
},
18691873
{

‎schemas/2022-08-08/Microsoft.Automation.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@
752752
"oneOf": [
753753
{
754754
"type": "string",
755-
"pattern": "^[a-zA-Z]*-*[a-zA-Z0-9]*$"
755+
"pattern": "^[a-zA-Z][a-zA-Z-_0-9]*$"
756756
},
757757
{
758758
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1819,7 +1819,7 @@
18191819
"oneOf": [
18201820
{
18211821
"type": "string",
1822-
"pattern": "^[a-zA-Z]*-*[a-zA-Z0-9]*$"
1822+
"pattern": "^[a-zA-Z][a-zA-Z-_0-9]*$"
18231823
},
18241824
{
18251825
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

‎schemas/2022-11-01/Microsoft.Compute.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3126,7 +3126,7 @@
31263126
},
31273127
"notBeforeTimeout": {
31283128
"type": "string",
3129-
"description": "Length of time a Virtual Machine being reimaged or having its OS upgraded will have to potentially approve the OS Image Scheduled Event before the event is auto approved (timed out). The configuration is specified in ISO 8601 format, with the value set to 15 minutes (PT15M)"
3129+
"description": "Length of time a Virtual Machine being reimaged or having its OS upgraded will have to potentially approve the OS Image Scheduled Event before the event is auto approved (timed out). The configuration is specified in ISO 8601 format, and the value must be 15 minutes (PT15M)"
31303130
}
31313131
}
31323132
},

0 commit comments

Comments
 (0)