Skip to content

Commit 1c6cc27

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #1517 from Azure/autogenerate
Autogenerate
2 parents bc2fb4a + 868d42f commit 1c6cc27

File tree

14 files changed

+131
-64
lines changed

14 files changed

+131
-64
lines changed

‎azure-pipelines-autogen.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- task: NodeTool@0
2929
inputs:
30-
versionSpec: '10.x'
30+
versionSpec: '14.x'
3131

3232
- script: |
3333
set -Eeuxo pipefail

‎schemas/2017-03-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2609,7 +2609,7 @@
26092609
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26102610
}
26112611
],
2612-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2612+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
26132613
},
26142614
"versionQueryName": {
26152615
"type": "string",

‎schemas/2017-04-18/Microsoft.CognitiveServices.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,14 @@
214214
],
215215
"description": "(Personalization Only) The flag to enable statistics of Bing Search."
216216
},
217+
"qnaAzureSearchEndpointId": {
218+
"type": "string",
219+
"description": "(QnAMaker Only) The Azure Search endpoint id of QnAMaker."
220+
},
221+
"qnaAzureSearchEndpointKey": {
222+
"type": "string",
223+
"description": "(QnAMaker Only) The Azure Search endpoint key of QnAMaker."
224+
},
217225
"qnaRuntimeEndpoint": {
218226
"type": "string",
219227
"description": "(QnAMaker Only) The runtime endpoint of QnAMaker."
@@ -560,7 +568,7 @@
560568
"PrivateLinkServiceConnectionState": {
561569
"type": "object",
562570
"properties": {
563-
"actionRequired": {
571+
"actionsRequired": {
564572
"type": "string",
565573
"description": "A message indicating if changes on the service provider require any updates on the consumer."
566574
},

‎schemas/2017-05-01-preview/Microsoft.MachineLearningExperimentation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,4 +470,4 @@
470470
"description": "The properties of a machine learning team account workspace."
471471
}
472472
}
473-
}
473+
}

‎schemas/2018-01-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2656,7 +2656,7 @@
26562656
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26572657
}
26582658
],
2659-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2659+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
26602660
},
26612661
"versionQueryName": {
26622662
"type": "string",

‎schemas/2019-01-01/Microsoft.ApiManagement.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,7 +2540,7 @@
25402540
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25412541
}
25422542
],
2543-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2543+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
25442544
},
25452545
"versionQueryName": {
25462546
"type": "string",
@@ -2582,7 +2582,7 @@
25822582
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25832583
}
25842584
],
2585-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2585+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
25862586
},
25872587
"versionQueryName": {
25882588
"type": "string",

‎schemas/2019-12-01/Microsoft.ApiManagement.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2814,7 +2814,7 @@
28142814
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
28152815
}
28162816
],
2817-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2817+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
28182818
},
28192819
"versionQueryName": {
28202820
"type": "string",
@@ -2856,7 +2856,7 @@
28562856
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
28572857
}
28582858
],
2859-
"description": "An value that determines where the API Version identifer will be located in a HTTP request."
2859+
"description": "An value that determines where the API Version identifier will be located in a HTTP request."
28602860
},
28612861
"versionQueryName": {
28622862
"type": "string",

‎schemas/2020-01-13-preview/Microsoft.Automation.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,6 +1674,10 @@
16741674
],
16751675
"description": "The properties of the create certificate operation."
16761676
},
1677+
"Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties": {
1678+
"type": "object",
1679+
"properties": {}
1680+
},
16771681
"ConnectionCreateOrUpdateProperties": {
16781682
"type": "object",
16791683
"properties": {
@@ -1965,6 +1969,17 @@
19651969
"EncryptionProperties": {
19661970
"type": "object",
19671971
"properties": {
1972+
"identity": {
1973+
"oneOf": [
1974+
{
1975+
"$ref": "#/definitions/EncryptionPropertiesIdentity"
1976+
},
1977+
{
1978+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1979+
}
1980+
],
1981+
"description": "User identity used for CMK."
1982+
},
19681983
"keySource": {
19691984
"oneOf": [
19701985
{
@@ -1994,6 +2009,17 @@
19942009
},
19952010
"description": "The encryption settings for automation account"
19962011
},
2012+
"EncryptionPropertiesIdentity": {
2013+
"type": "object",
2014+
"properties": {
2015+
"userAssignedIdentity": {
2016+
"type": "object",
2017+
"properties": {},
2018+
"description": "The user identity used for CMK. It will be an ARM resource id in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
2019+
}
2020+
},
2021+
"description": "User identity used for CMK."
2022+
},
19972023
"FieldDefinition": {
19982024
"type": "object",
19992025
"properties": {
@@ -2038,6 +2064,8 @@
20382064
"type": "string",
20392065
"enum": [
20402066
"SystemAssigned",
2067+
"UserAssigned",
2068+
"SystemAssigned, UserAssigned",
20412069
"None"
20422070
]
20432071
},
@@ -2046,6 +2074,21 @@
20462074
}
20472075
],
20482076
"description": "The identity type."
2077+
},
2078+
"userAssignedIdentities": {
2079+
"oneOf": [
2080+
{
2081+
"type": "object",
2082+
"additionalProperties": {
2083+
"$ref": "#/definitions/Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties"
2084+
},
2085+
"properties": {}
2086+
},
2087+
{
2088+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2089+
}
2090+
],
2091+
"description": "The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
20492092
}
20502093
},
20512094
"description": "Identity for the resource."

‎schemas/2020-04-01-preview/Microsoft.EventGrid.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,8 @@
731731
"maxEventsPerBatch": {
732732
"oneOf": [
733733
{
734-
"type": "integer"
734+
"type": "integer",
735+
"default": "1"
735736
},
736737
{
737738
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -742,7 +743,8 @@
742743
"preferredBatchSizeInKilobytes": {
743744
"oneOf": [
744745
{
745-
"type": "integer"
746+
"type": "integer",
747+
"default": "64"
746748
},
747749
{
748750
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2550,7 +2552,8 @@
25502552
"maxEventsPerBatch": {
25512553
"oneOf": [
25522554
{
2553-
"type": "integer"
2555+
"type": "integer",
2556+
"default": "1"
25542557
},
25552558
{
25562559
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2561,7 +2564,8 @@
25612564
"preferredBatchSizeInKilobytes": {
25622565
"oneOf": [
25632566
{
2564-
"type": "integer"
2567+
"type": "integer",
2568+
"default": "64"
25652569
},
25662570
{
25672571
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

‎schemas/2020-06-01-preview/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4978,7 +4978,7 @@
49784978
},
49794979
"description": {
49804980
"type": "string",
4981-
"minLength": 1,
4981+
"minLength": 0,
49824982
"maxLength": 1000,
49834983
"description": "Product description. May include HTML formatting tags."
49844984
},

0 commit comments

Comments
 (0)