Skip to content

Commit 63e9481

Browse files
matthchrmatthchr
authored
ARM ID annotations for EventGrid (#19590)
1 parent 9e8a3d8 commit 63e9481

File tree

3 files changed

+147
-21
lines changed

3 files changed

+147
-21
lines changed

‎specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2020-06-01/EventGrid.json‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,7 +3415,15 @@
34153415
"properties": {
34163416
"resourceId": {
34173417
"description": "The Azure Resource ID of the storage account that is the destination of the deadletter events",
3418-
"type": "string"
3418+
"type": "string",
3419+
"format": "arm-id",
3420+
"x-ms-arm-id-details": {
3421+
"allowedResources": [
3422+
{
3423+
"type": "Microsoft.Storage/storageAccounts"
3424+
}
3425+
]
3426+
}
34193427
},
34203428
"blobContainerName": {
34213429
"description": "The name of the Storage blob container that is the destination of the deadletter events",
@@ -3739,7 +3747,8 @@
37393747
"properties": {
37403748
"resourceId": {
37413749
"description": "The Azure Resource Id that represents the endpoint of an Event Hub destination of an event subscription.",
3742-
"type": "string"
3750+
"type": "string",
3751+
"format": "arm-id"
37433752
}
37443753
}
37453754
},
@@ -3766,7 +3775,15 @@
37663775
"properties": {
37673776
"resourceId": {
37683777
"description": "The Azure Resource ID of the storage account that contains the queue that is the destination of an event subscription.",
3769-
"type": "string"
3778+
"type": "string",
3779+
"format": "arm-id",
3780+
"x-ms-arm-id-details": {
3781+
"allowedResources": [
3782+
{
3783+
"type": "Microsoft.Storage/storageAccounts/queues"
3784+
}
3785+
]
3786+
}
37703787
},
37713788
"queueName": {
37723789
"description": "The name of the Storage queue under a storage account that is the destination of an event subscription.",
@@ -3797,7 +3814,8 @@
37973814
"properties": {
37983815
"resourceId": {
37993816
"description": "The Azure Resource ID of an hybrid connection that is the destination of an event subscription.",
3800-
"type": "string"
3817+
"type": "string",
3818+
"format": "arm-id"
38013819
}
38023820
}
38033821
},
@@ -3824,7 +3842,15 @@
38243842
"properties": {
38253843
"resourceId": {
38263844
"description": "The Azure Resource Id that represents the endpoint of the Service Bus destination of an event subscription.",
3827-
"type": "string"
3845+
"type": "string",
3846+
"format": "arm-id",
3847+
"x-ms-arm-id-details": {
3848+
"allowedResources": [
3849+
{
3850+
"type": "Microsoft.ServiceBus/namespaces/queues"
3851+
}
3852+
]
3853+
}
38283854
}
38293855
}
38303856
},
@@ -3851,7 +3877,15 @@
38513877
"properties": {
38523878
"resourceId": {
38533879
"description": "The Azure Resource Id that represents the endpoint of the Service Bus Topic destination of an event subscription.",
3854-
"type": "string"
3880+
"type": "string",
3881+
"format": "arm-id",
3882+
"x-ms-arm-id-details": {
3883+
"allowedResources": [
3884+
{
3885+
"type": "Microsoft.ServiceBus/namespaces/topics"
3886+
}
3887+
]
3888+
}
38553889
}
38563890
}
38573891
},
@@ -3878,7 +3912,15 @@
38783912
"properties": {
38793913
"resourceId": {
38803914
"description": "The Azure Resource Id that represents the endpoint of the Azure Function destination of an event subscription.",
3881-
"type": "string"
3915+
"type": "string",
3916+
"format": "arm-id",
3917+
"x-ms-arm-id-details": {
3918+
"allowedResources": [
3919+
{
3920+
"type": "Microsoft.Web/sites/functions"
3921+
}
3922+
]
3923+
}
38823924
},
38833925
"maxEventsPerBatch": {
38843926
"format": "int32",

‎specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2021-12-01/EventGrid.json‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4492,7 +4492,15 @@
44924492
"properties": {
44934493
"resourceId": {
44944494
"description": "The Azure Resource ID of the storage account that is the destination of the deadletter events",
4495-
"type": "string"
4495+
"type": "string",
4496+
"format": "arm-id",
4497+
"x-ms-arm-id-details": {
4498+
"allowedResources": [
4499+
{
4500+
"type": "Microsoft.Storage/storageAccounts"
4501+
}
4502+
]
4503+
}
44964504
},
44974505
"blobContainerName": {
44984506
"description": "The name of the Storage blob container that is the destination of the deadletter events",
@@ -4998,7 +5006,8 @@
49985006
"properties": {
49995007
"resourceId": {
50005008
"description": "The Azure Resource Id that represents the endpoint of an Event Hub destination of an event subscription.",
5001-
"type": "string"
5009+
"type": "string",
5010+
"format": "arm-id"
50025011
},
50035012
"deliveryAttributeMappings": {
50045013
"description": "Delivery attribute details.",
@@ -5032,7 +5041,15 @@
50325041
"properties": {
50335042
"resourceId": {
50345043
"description": "The Azure Resource ID of the storage account that contains the queue that is the destination of an event subscription.",
5035-
"type": "string"
5044+
"type": "string",
5045+
"format": "arm-id",
5046+
"x-ms-arm-id-details": {
5047+
"allowedResources": [
5048+
{
5049+
"type": "Microsoft.Storage/storageAccounts"
5050+
}
5051+
]
5052+
}
50365053
},
50375054
"queueName": {
50385055
"description": "The name of the Storage queue under a storage account that is the destination of an event subscription.",
@@ -5068,7 +5085,8 @@
50685085
"properties": {
50695086
"resourceId": {
50705087
"description": "The Azure Resource ID of an hybrid connection that is the destination of an event subscription.",
5071-
"type": "string"
5088+
"type": "string",
5089+
"format": "arm-id"
50725090
},
50735091
"deliveryAttributeMappings": {
50745092
"description": "Delivery attribute details.",
@@ -5102,7 +5120,15 @@
51025120
"properties": {
51035121
"resourceId": {
51045122
"description": "The Azure Resource Id that represents the endpoint of the Service Bus destination of an event subscription.",
5105-
"type": "string"
5123+
"type": "string",
5124+
"format": "arm-id",
5125+
"x-ms-arm-id-details": {
5126+
"allowedResources": [
5127+
{
5128+
"type": "Microsoft.ServiceBus/namespaces/queues"
5129+
}
5130+
]
5131+
}
51065132
},
51075133
"deliveryAttributeMappings": {
51085134
"description": "Delivery attribute details.",
@@ -5136,7 +5162,15 @@
51365162
"properties": {
51375163
"resourceId": {
51385164
"description": "The Azure Resource Id that represents the endpoint of the Service Bus Topic destination of an event subscription.",
5139-
"type": "string"
5165+
"type": "string",
5166+
"format": "arm-id",
5167+
"x-ms-arm-id-details": {
5168+
"allowedResources": [
5169+
{
5170+
"type": "Microsoft.ServiceBus/namespaces/topics"
5171+
}
5172+
]
5173+
}
51405174
},
51415175
"deliveryAttributeMappings": {
51425176
"description": "Delivery attribute details.",
@@ -5170,7 +5204,15 @@
51705204
"properties": {
51715205
"resourceId": {
51725206
"description": "The Azure Resource Id that represents the endpoint of the Azure Function destination of an event subscription.",
5173-
"type": "string"
5207+
"type": "string",
5208+
"format": "arm-id",
5209+
"x-ms-arm-id-details": {
5210+
"allowedResources": [
5211+
{
5212+
"type": "Microsoft.Web/sites/functions"
5213+
}
5214+
]
5215+
}
51745216
},
51755217
"maxEventsPerBatch": {
51765218
"format": "int32",

‎specification/eventgrid/resource-manager/Microsoft.EventGrid/stable/2022-06-15/EventGrid.json‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8723,7 +8723,15 @@
87238723
"properties": {
87248724
"resourceId": {
87258725
"description": "The Azure Resource ID of the storage account that is the destination of the deadletter events",
8726-
"type": "string"
8726+
"type": "string",
8727+
"format": "arm-id",
8728+
"x-ms-arm-id-details": {
8729+
"allowedResources": [
8730+
{
8731+
"type": "Microsoft.Storage/storageAccounts"
8732+
}
8733+
]
8734+
}
87278735
},
87288736
"blobContainerName": {
87298737
"description": "The name of the Storage blob container that is the destination of the deadletter events",
@@ -9229,7 +9237,8 @@
92299237
"properties": {
92309238
"resourceId": {
92319239
"description": "The Azure Resource Id that represents the endpoint of an Event Hub destination of an event subscription.",
9232-
"type": "string"
9240+
"type": "string",
9241+
"format": "arm-id"
92339242
},
92349243
"deliveryAttributeMappings": {
92359244
"description": "Delivery attribute details.",
@@ -9263,7 +9272,15 @@
92639272
"properties": {
92649273
"resourceId": {
92659274
"description": "The Azure Resource ID of the storage account that contains the queue that is the destination of an event subscription.",
9266-
"type": "string"
9275+
"type": "string",
9276+
"format": "arm-id",
9277+
"x-ms-arm-id-details": {
9278+
"allowedResources": [
9279+
{
9280+
"type": "Microsoft.Storage/storageAccounts"
9281+
}
9282+
]
9283+
}
92679284
},
92689285
"queueName": {
92699286
"description": "The name of the Storage queue under a storage account that is the destination of an event subscription.",
@@ -9299,7 +9316,8 @@
92999316
"properties": {
93009317
"resourceId": {
93019318
"description": "The Azure Resource ID of an hybrid connection that is the destination of an event subscription.",
9302-
"type": "string"
9319+
"type": "string",
9320+
"format": "arm-id"
93039321
},
93049322
"deliveryAttributeMappings": {
93059323
"description": "Delivery attribute details.",
@@ -9333,7 +9351,15 @@
93339351
"properties": {
93349352
"resourceId": {
93359353
"description": "The Azure Resource Id that represents the endpoint of the Service Bus destination of an event subscription.",
9336-
"type": "string"
9354+
"type": "string",
9355+
"format": "arm-id",
9356+
"x-ms-arm-id-details": {
9357+
"allowedResources": [
9358+
{
9359+
"type": "Microsoft.ServiceBus/namespaces/queues"
9360+
}
9361+
]
9362+
}
93379363
},
93389364
"deliveryAttributeMappings": {
93399365
"description": "Delivery attribute details.",
@@ -9367,7 +9393,15 @@
93679393
"properties": {
93689394
"resourceId": {
93699395
"description": "The Azure Resource Id that represents the endpoint of the Service Bus Topic destination of an event subscription.",
9370-
"type": "string"
9396+
"type": "string",
9397+
"format": "arm-id",
9398+
"x-ms-arm-id-details": {
9399+
"allowedResources": [
9400+
{
9401+
"type": "Microsoft.ServiceBus/namespaces/topics"
9402+
}
9403+
]
9404+
}
93719405
},
93729406
"deliveryAttributeMappings": {
93739407
"description": "Delivery attribute details.",
@@ -9401,7 +9435,15 @@
94019435
"properties": {
94029436
"resourceId": {
94039437
"description": "The Azure Resource Id that represents the endpoint of the Azure Function destination of an event subscription.",
9404-
"type": "string"
9438+
"type": "string",
9439+
"format": "arm-id",
9440+
"x-ms-arm-id-details": {
9441+
"allowedResources": [
9442+
{
9443+
"type": "Microsoft.Web/sites/functions"
9444+
}
9445+
]
9446+
}
94059447
},
94069448
"maxEventsPerBatch": {
94079449
"format": "int32",

0 commit comments

Comments
 (0)