Skip to content

Commit 2a02aa7

Browse files
authored
Merge pull request #1483 from Azure/fix-1470
Fix 1470
2 parents bd49c85 + 3c2d9d6 commit 2a02aa7

File tree

6 files changed

+284
-1
lines changed

6 files changed

+284
-1
lines changed

schemas/2014-04-01-preview/deploymentTemplate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
{ "$ref": "https://schema.management.azure.com/schemas/2016-05-16/Microsoft.AnalysisServices.json#/resourceDefinitions/servers" },
6161
{ "$ref": "https://schema.management.azure.com/schemas/2017-08-01/Microsoft.AnalysisServices.json#/resourceDefinitions/servers" },
6262
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults" },
63+
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.legacy.json#/resourceDefinitions/vaults" },
6364
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_certificates" },
6465
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_extendedInformation" },
6566
{ "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json#/resourceDefinitions/digitalTwinsInstances" },
@@ -1704,6 +1705,9 @@
17041705
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/clusters" },
17051706
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/fileServers" },
17061707
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/jobs" },
1708+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers_protectedItems" },
1709+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupPolicies" },
1710+
{ "$ref": "https://schema.management.azure.com/schemas/2017-07-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_backupProtectionIntent" },
17071711
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.Backup.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers" },
17081712
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.Backup.json#/resourceDefinitions/vaults_backupstorageconfig" },
17091713
{ "$ref": "https://schema.management.azure.com/schemas/2018-04-01/Microsoft.Compute.json#/resourceDefinitions/disks" },

schemas/2015-01-01/deploymentTemplate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
{ "$ref": "https://schema.management.azure.com/schemas/2016-05-16/Microsoft.AnalysisServices.json#/resourceDefinitions/servers" },
7575
{ "$ref": "https://schema.management.azure.com/schemas/2017-08-01/Microsoft.AnalysisServices.json#/resourceDefinitions/servers" },
7676
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults" },
77+
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.legacy.json#/resourceDefinitions/vaults" },
7778
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_certificates" },
7879
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_extendedInformation" },
7980
{ "$ref": "https://schema.management.azure.com/schemas/2015-04-08/Microsoft.DocumentDB.json#/resourceDefinitions/databaseAccounts" },
@@ -1841,6 +1842,9 @@
18411842
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/clusters" },
18421843
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/fileServers" },
18431844
{ "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.BatchAI.json#/resourceDefinitions/jobs" },
1845+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers_protectedItems" },
1846+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupPolicies" },
1847+
{ "$ref": "https://schema.management.azure.com/schemas/2017-07-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_backupProtectionIntent" },
18441848
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.Backup.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers" },
18451849
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.Backup.json#/resourceDefinitions/vaults_backupstorageconfig" },
18461850
{ "$ref": "https://schema.management.azure.com/schemas/2018-04-01/Microsoft.Compute.json#/resourceDefinitions/disks" },
Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,259 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.legacy.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.RecoveryServices",
5+
"description": "Microsoft Recovery Services Resource Types",
6+
"resourceDefinitions": {
7+
"vaults": {
8+
"type": "object",
9+
"properties": {
10+
"type": {
11+
"type": "string",
12+
"enum": [
13+
"Microsoft.RecoveryServices/vaults"
14+
]
15+
},
16+
"apiVersion": {
17+
"type": "string",
18+
"enum": [
19+
"2018-01-10",
20+
"2017-07-01",
21+
"2016-05-01",
22+
"2015-12-15",
23+
"2015-11-10",
24+
"2015-08-15",
25+
"2015-08-10",
26+
"2015-06-10",
27+
"2015-03-15"
28+
]
29+
},
30+
"sku": {
31+
"oneOf": [
32+
{
33+
"$ref": "#/definitions/Sku"
34+
},
35+
{
36+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
37+
}
38+
],
39+
"description": "Required. Gets or sets the sku type."
40+
},
41+
"location": {
42+
"type": "string",
43+
"description": "Required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update the request will succeed."
44+
},
45+
"tags": {
46+
"oneOf": [
47+
{
48+
"type": "object",
49+
"additionalProperties": {
50+
"type": "string"
51+
}
52+
},
53+
{
54+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
55+
}
56+
],
57+
"description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
58+
},
59+
"properties": {
60+
"oneOf": [
61+
{
62+
"$ref": "#/definitions/RecoveryServicesPropertiesCreateParameters"
63+
},
64+
{
65+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
66+
}
67+
]
68+
}
69+
},
70+
"required": [
71+
"type",
72+
"apiVersion",
73+
"sku",
74+
"location",
75+
"properties"
76+
],
77+
"description": "Microsoft.RecoveryServices/vaults"
78+
},
79+
"vaults_certificates": {
80+
"type": "object",
81+
"properties": {
82+
"name": {
83+
"type": "string"
84+
},
85+
"type": {
86+
"type": "string",
87+
"enum": [
88+
"Microsoft.RecoveryServices/vaults/certificates"
89+
]
90+
},
91+
"apiVersion": {
92+
"type": "string",
93+
"enum": [
94+
"2016-06-01"
95+
]
96+
},
97+
"properties": {
98+
"oneOf": [
99+
{
100+
"$ref": "#/definitions/RawCertificateData"
101+
},
102+
{
103+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
104+
}
105+
]
106+
}
107+
},
108+
"required": [
109+
"name",
110+
"type",
111+
"apiVersion",
112+
"properties"
113+
],
114+
"description": "Microsoft.RecoveryServices/vaults/certificates"
115+
},
116+
"vaults_extendedInformation": {
117+
"type": "object",
118+
"properties": {
119+
"type": {
120+
"type": "string",
121+
"enum": [
122+
"Microsoft.RecoveryServices/vaults/extendedInformation"
123+
]
124+
},
125+
"apiVersion": {
126+
"type": "string",
127+
"enum": [
128+
"2016-06-01"
129+
]
130+
},
131+
"eTag": {
132+
"type": "string",
133+
"description": "Optional ETag."
134+
},
135+
"properties": {
136+
"oneOf": [
137+
{
138+
"$ref": "#/definitions/VaultExtendedInfo"
139+
},
140+
{
141+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
142+
}
143+
]
144+
}
145+
},
146+
"required": [
147+
"type",
148+
"apiVersion",
149+
"properties"
150+
],
151+
"description": "Microsoft.RecoveryServices/vaults/extendedInformation"
152+
}
153+
},
154+
"definitions": {
155+
"Sku": {
156+
"type": "object",
157+
"properties": {
158+
"name": {
159+
"oneOf": [
160+
{
161+
"type": "string",
162+
"enum": [
163+
"RS0"
164+
]
165+
},
166+
{
167+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
168+
}
169+
],
170+
"description": "Gets or sets the sku name. Required for vault creation, optional for update. Possible values include: 'RS0'"
171+
},
172+
"tier": {
173+
"oneOf": [
174+
{
175+
"type": "string",
176+
"enum": [
177+
"Standard"
178+
]
179+
},
180+
{
181+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
182+
}
183+
],
184+
"description": "Gets or sets the sku tier. Required for vault creation, optional for update. Possible values include: 'Standard'"
185+
}
186+
},
187+
"required": [
188+
"name",
189+
"tier"
190+
],
191+
"description": "The SKU of the recovery services vault."
192+
},
193+
"RecoveryServicesPropertiesCreateParameters": {
194+
"type": "object",
195+
"properties": {
196+
}
197+
},
198+
"RawCertificateData": {
199+
"type": "object",
200+
"properties": {
201+
"authType": {
202+
"oneOf": [
203+
{
204+
"type": "string",
205+
"enum": [
206+
"Invalid",
207+
"ACS",
208+
"AAD",
209+
"AccessControlService",
210+
"AzureActiveDirectory"
211+
]
212+
},
213+
{
214+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
215+
}
216+
],
217+
"description": "Specifies the authentication type."
218+
},
219+
"certificate": {
220+
"oneOf": [
221+
{
222+
"type": "array",
223+
"items": {
224+
"type": "string"
225+
}
226+
},
227+
{
228+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
229+
}
230+
],
231+
"description": "The base64 encoded certificate raw data string"
232+
}
233+
},
234+
"description": "Raw certificate data."
235+
},
236+
"VaultExtendedInfo": {
237+
"type": "object",
238+
"properties": {
239+
"integrityKey": {
240+
"type": "string",
241+
"description": "Integrity key."
242+
},
243+
"encryptionKey": {
244+
"type": "string",
245+
"description": "Encryption key."
246+
},
247+
"encryptionKeyThumbprint": {
248+
"type": "string",
249+
"description": "Encryption key thumbprint."
250+
},
251+
"algorithm": {
252+
"type": "string",
253+
"description": "Algorithm for Vault ExtendedInfo"
254+
}
255+
},
256+
"description": "Vault extended information."
257+
}
258+
}
259+
}

schemas/2019-03-01-hybrid/deploymentTemplate.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@
332332
{
333333
"$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults"
334334
},
335+
{
336+
"$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.legacy.json#/resourceDefinitions/vaults"
337+
},
335338
{
336339
"$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_certificates"
337340
},
@@ -2684,6 +2687,15 @@
26842687
{
26852688
"$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.Backup.json#/resourceDefinitions/vaults_backupstorageconfig"
26862689
},
2690+
{
2691+
"$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers_protectedItems"
2692+
},
2693+
{
2694+
"$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupPolicies"
2695+
},
2696+
{
2697+
"$ref": "https://schema.management.azure.com/schemas/2017-07-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_backupProtectionIntent"
2698+
},
26872699
{
26882700
"$ref": "https://schema.management.azure.com/schemas/2018-04-01/Microsoft.Compute.json#/resourceDefinitions/disks"
26892701
},

schemas/2019-04-01/deploymentTemplate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
{
5656
"oneOf": [
5757
{ "$ref": "https://schema.management.azure.com/schemas/2017-08-01-preview/Microsoft.Genomics.json#/resourceDefinitions/accounts" },
58+
{ "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.RecoveryServices.legacy.json#/resourceDefinitions/vaults" },
5859
{ "$ref": "https://schema.management.azure.com/schemas/2015-06-01/Microsoft.KeyVault.json#/resourceDefinitions/secrets" },
5960
{ "$ref": "https://schema.management.azure.com/schemas/2016-10-01/Microsoft.KeyVault.json#/resourceDefinitions/vaults_accessPolicies" },
6061
{ "$ref": "https://schema.management.azure.com/schemas/2016-10-01/Microsoft.KeyVault.json#/resourceDefinitions/vaults_secrets" },
@@ -1394,6 +1395,9 @@
13941395
{ "$ref": "https://schema.management.azure.com/schemas/2017-11-15-preview/Microsoft.DataMigration.json#/resourceDefinitions/services_projects" },
13951396
{ "$ref": "https://schema.management.azure.com/schemas/2017-11-15-privatepreview/Microsoft.DataMigration.json#/resourceDefinitions/services" },
13961397
{ "$ref": "https://schema.management.azure.com/schemas/2017-11-15-privatepreview/Microsoft.DataMigration.json#/resourceDefinitions/services_projects" },
1398+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_protectionContainers_protectedItems" },
1399+
{ "$ref": "https://schema.management.azure.com/schemas/2016-12-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupPolicies" },
1400+
{ "$ref": "https://schema.management.azure.com/schemas/2017-07-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_backupFabrics_backupProtectionIntent" },
13971401
{ "$ref": "https://schema.management.azure.com/schemas/2018-04-01/Microsoft.Compute.json#/resourceDefinitions/disks" },
13981402
{ "$ref": "https://schema.management.azure.com/schemas/2018-04-01/Microsoft.Compute.json#/resourceDefinitions/snapshots" },
13991403
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries" },

tools/templateTests/Template_2.2014-01-01-preview.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
},
321321
{
322322
"type": "Microsoft.RecoveryServices/vaults",
323-
"apiVersion": "2016-06-01",
323+
"apiVersion": "2015-12-15",
324324
"location": "Australia East",
325325
"name": "valuts",
326326
"sku": {

0 commit comments

Comments
 (0)