Skip to content

Commit 4d8b88f

Browse files
XynoclafeXynoclafe
authored
Merge pull request #2970 from Azure/autogenerate-batch
Update Generated Schemas
2 parents a435a5a + 50099b7 commit 4d8b88f

File tree

9 files changed

+17838
-117
lines changed

9 files changed

+17838
-117
lines changed

‎schemas/2023-01-01/Microsoft.StorageActions.json

Lines changed: 326 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,326 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2023-01-01/Microsoft.StorageActions.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.StorageActions",
5+
"description": "Microsoft StorageActions Resource Types",
6+
"resourceDefinitions": {
7+
"storageTasks": {
8+
"type": "object",
9+
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2023-01-01"
14+
]
15+
},
16+
"identity": {
17+
"oneOf": [
18+
{
19+
"$ref": "#/definitions/ManagedServiceIdentity"
20+
},
21+
{
22+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23+
}
24+
],
25+
"description": "Managed service identity (system assigned and/or user assigned identities)"
26+
},
27+
"location": {
28+
"type": "string",
29+
"description": "The geo-location where the resource lives"
30+
},
31+
"name": {
32+
"oneOf": [
33+
{
34+
"type": "string",
35+
"pattern": "^[a-z0-9]{3,18}$",
36+
"minLength": 3,
37+
"maxLength": 18
38+
},
39+
{
40+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
41+
}
42+
],
43+
"description": "The name of the storage task within the specified resource group. Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only."
44+
},
45+
"properties": {
46+
"oneOf": [
47+
{
48+
"$ref": "#/definitions/StorageTaskProperties"
49+
},
50+
{
51+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
52+
}
53+
],
54+
"description": "Properties of the storage task."
55+
},
56+
"tags": {
57+
"oneOf": [
58+
{
59+
"type": "object",
60+
"additionalProperties": {
61+
"type": "string"
62+
},
63+
"properties": {}
64+
},
65+
{
66+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
67+
}
68+
],
69+
"description": "Resource tags."
70+
},
71+
"type": {
72+
"type": "string",
73+
"enum": [
74+
"Microsoft.StorageActions/storageTasks"
75+
]
76+
}
77+
},
78+
"required": [
79+
"apiVersion",
80+
"location",
81+
"name",
82+
"properties",
83+
"type"
84+
],
85+
"description": "Microsoft.StorageActions/storageTasks"
86+
}
87+
},
88+
"definitions": {
89+
"ElseCondition": {
90+
"type": "object",
91+
"properties": {
92+
"operations": {
93+
"oneOf": [
94+
{
95+
"type": "array",
96+
"items": {
97+
"$ref": "#/definitions/StorageTaskOperation"
98+
}
99+
},
100+
{
101+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
102+
}
103+
],
104+
"description": "List of operations to execute in the else block"
105+
}
106+
},
107+
"required": [
108+
"operations"
109+
],
110+
"description": "The else block of storage task operation"
111+
},
112+
"IfCondition": {
113+
"type": "object",
114+
"properties": {
115+
"condition": {
116+
"type": "string",
117+
"description": "The condition predicate which is composed of object properties, eg: blob and container properties."
118+
},
119+
"operations": {
120+
"oneOf": [
121+
{
122+
"type": "array",
123+
"items": {
124+
"$ref": "#/definitions/StorageTaskOperation"
125+
}
126+
},
127+
{
128+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
129+
}
130+
],
131+
"description": "List of operations to execute when the condition predicate satisfies."
132+
}
133+
},
134+
"required": [
135+
"condition",
136+
"operations"
137+
],
138+
"description": "The if block of storage task operation"
139+
},
140+
"ManagedServiceIdentity": {
141+
"type": "object",
142+
"properties": {
143+
"type": {
144+
"oneOf": [
145+
{
146+
"type": "string",
147+
"enum": [
148+
"None",
149+
"SystemAssigned",
150+
"UserAssigned",
151+
"SystemAssigned,UserAssigned"
152+
]
153+
},
154+
{
155+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
156+
}
157+
]
158+
},
159+
"userAssignedIdentities": {
160+
"oneOf": [
161+
{
162+
"type": "object",
163+
"additionalProperties": {
164+
"$ref": "#/definitions/UserAssignedIdentity"
165+
},
166+
"properties": {}
167+
},
168+
{
169+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
170+
}
171+
],
172+
"description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests."
173+
}
174+
},
175+
"required": [
176+
"type"
177+
],
178+
"description": "Managed service identity (system assigned and/or user assigned identities)"
179+
},
180+
"StorageTaskAction": {
181+
"type": "object",
182+
"properties": {
183+
"else": {
184+
"oneOf": [
185+
{
186+
"$ref": "#/definitions/ElseCondition"
187+
},
188+
{
189+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
190+
}
191+
],
192+
"description": "The else block of storage task operation"
193+
},
194+
"if": {
195+
"oneOf": [
196+
{
197+
"$ref": "#/definitions/IfCondition"
198+
},
199+
{
200+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
201+
}
202+
],
203+
"description": "The if block of storage task operation"
204+
}
205+
},
206+
"required": [
207+
"if"
208+
],
209+
"description": "The storage task action represents conditional statements and operations to be performed on target objects."
210+
},
211+
"StorageTaskOperation": {
212+
"type": "object",
213+
"properties": {
214+
"name": {
215+
"oneOf": [
216+
{
217+
"type": "string",
218+
"enum": [
219+
"SetBlobTier",
220+
"SetBlobTags",
221+
"SetBlobImmutabilityPolicy",
222+
"SetBlobLegalHold",
223+
"SetBlobExpiry",
224+
"DeleteBlob",
225+
"UndeleteBlob"
226+
]
227+
},
228+
{
229+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
230+
}
231+
],
232+
"description": "The operation to be performed on the object."
233+
},
234+
"onFailure": {
235+
"oneOf": [
236+
{
237+
"type": "string",
238+
"enum": [
239+
"break"
240+
]
241+
},
242+
{
243+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
244+
}
245+
],
246+
"description": "Action to be taken when the operation fails for a object."
247+
},
248+
"onSuccess": {
249+
"oneOf": [
250+
{
251+
"type": "string",
252+
"enum": [
253+
"continue"
254+
]
255+
},
256+
{
257+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
258+
}
259+
],
260+
"description": "Action to be taken when the operation is successful for a object."
261+
},
262+
"parameters": {
263+
"oneOf": [
264+
{
265+
"type": "object",
266+
"additionalProperties": {
267+
"type": "string"
268+
},
269+
"properties": {}
270+
},
271+
{
272+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
273+
}
274+
],
275+
"description": "Key-value parameters for the operation."
276+
}
277+
},
278+
"required": [
279+
"name"
280+
],
281+
"description": "Represents an operation to be performed on the object"
282+
},
283+
"StorageTaskProperties": {
284+
"type": "object",
285+
"properties": {
286+
"action": {
287+
"oneOf": [
288+
{
289+
"$ref": "#/definitions/StorageTaskAction"
290+
},
291+
{
292+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
293+
}
294+
],
295+
"description": "The storage task action represents conditional statements and operations to be performed on target objects."
296+
},
297+
"description": {
298+
"type": "string",
299+
"description": "Text that describes the purpose of the storage task"
300+
},
301+
"enabled": {
302+
"oneOf": [
303+
{
304+
"type": "boolean"
305+
},
306+
{
307+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
308+
}
309+
],
310+
"description": "Storage Task is enabled when set to true and disabled when set to false"
311+
}
312+
},
313+
"required": [
314+
"action",
315+
"description",
316+
"enabled"
317+
],
318+
"description": "Properties of the storage task."
319+
},
320+
"UserAssignedIdentity": {
321+
"type": "object",
322+
"properties": {},
323+
"description": "User assigned identity properties"
324+
}
325+
}
326+
}

‎schemas/2023-05-01/Microsoft.Batch.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,6 +1367,7 @@
13671367
},
13681368
"resizeTimeout": {
13691369
"type": "string",
1370+
"default": "PT15M",
13701371
"format": "duration",
13711372
"description": "The default value is 15 minutes. Timeout values use ISO 8601 format. For example, use PT10M for 10 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service rejects the request with an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request)."
13721373
},
@@ -1415,6 +1416,7 @@
14151416
},
14161417
"version": {
14171418
"type": "string",
1419+
"default": "latest",
14181420
"description": "A value of 'latest' can be specified to select the latest version of an image. If omitted, the default is 'latest'."
14191421
}
14201422
}
@@ -2024,7 +2026,8 @@
20242026
"taskSlotsPerNode": {
20252027
"oneOf": [
20262028
{
2027-
"type": "integer"
2029+
"type": "integer",
2030+
"default": "1"
20282031
},
20292032
{
20302033
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2187,13 +2190,14 @@
21872190
"maxTaskRetryCount": {
21882191
"oneOf": [
21892192
{
2190-
"type": "integer"
2193+
"type": "integer",
2194+
"default": "0"
21912195
},
21922196
{
21932197
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
21942198
}
21952199
],
2196-
"description": "The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try the task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries the task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry the task. If the maximum retry count is -1, the Batch service retries the task without limit."
2200+
"description": "The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try the task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries the task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry the task. If the maximum retry count is -1, the Batch service retries the task without limit. Default is 0."
21972201
},
21982202
"resourceFiles": {
21992203
"oneOf": [

0 commit comments

Comments
 (0)