Skip to content

Commit e54e00d

Browse files
jorgecotillojorgecotillo
committed
fixed microsoft.resources:
1 parent 631839b commit e54e00d

File tree

3 files changed

+159
-5
lines changed

3 files changed

+159
-5
lines changed

‎generator/autogenlist.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ const disabledProviders: AutoGenConfig[] = [
107107
basePath: 'confidentialLedger/resource-manager',
108108
namespace: 'Microsoft.ConfidentialLedger',
109109
disabledForAutogen: true
110-
}
110+
},
111+
/*{
112+
// Disabled temporally due to enum mismatch introduced in this PR: https://github.com/Azure/azure-rest-api-specs/pull/24350
113+
basePath: 'resources/resource-manager',
114+
namespace: 'Microsoft.Resources',
115+
disabledForAutogen: true
116+
}*/
111117
];
112118

113119
// Run "npm run list-basepaths" to discover all the valid readme files to add to this list

‎schemas/2021-10-01-preview/Microsoft.StreamAnalytics.json‎

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,66 @@
296296
],
297297
"description": "Describes how data from an input is serialized or how data is serialized when written to an output in Avro format."
298298
},
299+
"AzureDataExplorerOutputDataSource": {
300+
"type": "object",
301+
"properties": {
302+
"properties": {
303+
"oneOf": [
304+
{
305+
"$ref": "#/definitions/AzureDataExplorerOutputDataSourceProperties"
306+
},
307+
{
308+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
309+
}
310+
],
311+
"description": "The properties that are associated with an Azure Data Explorer output."
312+
},
313+
"type": {
314+
"type": "string",
315+
"enum": [
316+
"Microsoft.Kusto/clusters/databases"
317+
]
318+
}
319+
},
320+
"required": [
321+
"type"
322+
],
323+
"description": "Describes an Azure Data Explorer output data source."
324+
},
325+
"AzureDataExplorerOutputDataSourceProperties": {
326+
"type": "object",
327+
"properties": {
328+
"authenticationMode": {
329+
"oneOf": [
330+
{
331+
"type": "string",
332+
"enum": [
333+
"Msi",
334+
"UserToken",
335+
"ConnectionString"
336+
]
337+
},
338+
{
339+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
340+
}
341+
],
342+
"description": "Authentication Mode."
343+
},
344+
"cluster": {
345+
"type": "string",
346+
"description": "The name of the Azure Data Explorer cluster. Required on PUT (CreateOrReplace) requests."
347+
},
348+
"database": {
349+
"type": "string",
350+
"description": "The name of the Azure Data Explorer database. Required on PUT (CreateOrReplace) requests."
351+
},
352+
"table": {
353+
"type": "string",
354+
"description": "The name of the Azure Table. Required on PUT (CreateOrReplace) requests."
355+
}
356+
},
357+
"description": "The properties that are associated with an Azure Data Explorer output."
358+
},
299359
"AzureDataLakeStoreOutputDataSource": {
300360
"type": "object",
301361
"properties": {
@@ -2263,8 +2323,19 @@
22632323
"description": "The type of identity, can be SystemAssigned or UserAssigned."
22642324
},
22652325
"userAssignedIdentities": {
2266-
"type": "object",
2267-
"properties": {},
2326+
"oneOf": [
2327+
{
2328+
"type": "object",
2329+
"additionalProperties": {
2330+
"type": "object",
2331+
"properties": {}
2332+
},
2333+
"properties": {}
2334+
},
2335+
{
2336+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2337+
}
2338+
],
22682339
"description": "The user assigned identities associated with the streaming job resource."
22692340
}
22702341
},
@@ -2610,6 +2681,9 @@
26102681
},
26112682
{
26122683
"$ref": "#/definitions/GatewayMessageBusOutputDataSource"
2684+
},
2685+
{
2686+
"$ref": "#/definitions/AzureDataExplorerOutputDataSource"
26132687
}
26142688
],
26152689
"properties": {},

‎schemas/2022-09-01/Microsoft.Resources.json‎

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,28 @@
486486
},
487487
"description": "The debug setting."
488488
},
489+
"DeploymentParameter": {
490+
"type": "object",
491+
"properties": {
492+
"reference": {
493+
"oneOf": [
494+
{
495+
"$ref": "#/definitions/KeyVaultParameterReference"
496+
},
497+
{
498+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
499+
}
500+
],
501+
"description": "Azure Key Vault parameter reference."
502+
},
503+
"value": {
504+
"type": "object",
505+
"properties": {},
506+
"description": "Input value to the parameter ."
507+
}
508+
},
509+
"description": "Deployment parameter for the template."
510+
},
489511
"DeploymentProperties": {
490512
"type": "object",
491513
"properties": {
@@ -538,8 +560,18 @@
538560
"description": "Deployment on error behavior."
539561
},
540562
"parameters": {
541-
"type": "object",
542-
"properties": {},
563+
"oneOf": [
564+
{
565+
"type": "object",
566+
"additionalProperties": {
567+
"$ref": "#/definitions/DeploymentParameter"
568+
},
569+
"properties": {}
570+
},
571+
{
572+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
573+
}
574+
],
543575
"description": "Name and value pairs that define the deployment parameters for the template. You use this element when you want to provide the parameter values directly in the request rather than link to an existing parameter file. Use either the parametersLink property or the parameters property, but not both. It can be a JObject or a well formed JSON string."
544576
},
545577
"parametersLink": {
@@ -597,6 +629,48 @@
597629
},
598630
"description": "Specifies whether template expressions are evaluated within the scope of the parent template or nested template."
599631
},
632+
"KeyVaultParameterReference": {
633+
"type": "object",
634+
"properties": {
635+
"keyVault": {
636+
"oneOf": [
637+
{
638+
"$ref": "#/definitions/KeyVaultReference"
639+
},
640+
{
641+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
642+
}
643+
],
644+
"description": "Azure Key Vault reference."
645+
},
646+
"secretName": {
647+
"type": "string",
648+
"description": "Azure Key Vault secret name."
649+
},
650+
"secretVersion": {
651+
"type": "string",
652+
"description": "Azure Key Vault secret version."
653+
}
654+
},
655+
"required": [
656+
"keyVault",
657+
"secretName"
658+
],
659+
"description": "Azure Key Vault parameter reference."
660+
},
661+
"KeyVaultReference": {
662+
"type": "object",
663+
"properties": {
664+
"id": {
665+
"type": "string",
666+
"description": "Azure Key Vault resource id."
667+
}
668+
},
669+
"required": [
670+
"id"
671+
],
672+
"description": "Azure Key Vault reference."
673+
},
600674
"OnErrorDeployment": {
601675
"type": "object",
602676
"properties": {

0 commit comments

Comments
 (0)