Skip to content

Commit f339be6

Browse files
roslynluRoslyn Lu
authored andcommitted
New 2020-03-01 API Version for Streaming Jobs (Azure#14199)
* copy 2016 version into 2020 folder to easily see diff * add the changes from 2017 preview * add dynamic scaling api and update api version to 2020 * add new version to readme * remove accidental changes to 2017 folder * fix streamingjobs.json * fix operations api * minor fixes * address some review comments * more validation fixes * address comments * fix breaking changes * prettier fix * update 2016 * fix some validation checks * try to fix location/tags validation error * fix lintdiff * fix lintdiff warnings * missed one Co-authored-by: Roslyn Lu <[email protected]>
1 parent cbdc565 commit f339be6

File tree

92 files changed

+9881
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+9881
-22
lines changed

specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/common/v1/definitions.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
}
3939
},
4040
"Resource": {
41+
"type": "object",
42+
"description": "The base resource definition",
4143
"properties": {
4244
"id": {
4345
"readOnly": true,
@@ -58,6 +60,7 @@
5860
"x-ms-azure-resource": true
5961
},
6062
"TrackedResource": {
63+
"type": "object",
6164
"description": "The resource model definition for a ARM tracked top level resource",
6265
"properties": {
6366
"tags": {
@@ -88,6 +91,7 @@
8891
]
8992
},
9093
"ProxyResource": {
94+
"type": "object",
9195
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags",
9296
"allOf": [
9397
{
@@ -96,8 +100,10 @@
96100
]
97101
},
98102
"Error": {
103+
"type": "object",
99104
"properties": {
100105
"error": {
106+
"type": "object",
101107
"properties": {
102108
"code": {
103109
"type": "string",
@@ -125,6 +131,7 @@
125131
"description": "Common error representation."
126132
},
127133
"ErrorDetails": {
134+
"type": "object",
128135
"properties": {
129136
"code": {
130137
"type": "string",

specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2016-03-01/functions.json

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
"type": "string"
115115
}
116116
}
117+
},
118+
"default": {
119+
"description": "Error.",
120+
"schema": {
121+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
122+
}
117123
}
118124
}
119125
},
@@ -177,6 +183,12 @@
177183
"type": "string"
178184
}
179185
}
186+
},
187+
"default": {
188+
"description": "Error.",
189+
"schema": {
190+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
191+
}
180192
}
181193
}
182194
},
@@ -214,6 +226,12 @@
214226
},
215227
"204": {
216228
"description": "The function does not exist."
229+
},
230+
"default": {
231+
"description": "Error.",
232+
"schema": {
233+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
234+
}
217235
}
218236
}
219237
},
@@ -260,6 +278,12 @@
260278
"type": "string"
261279
}
262280
}
281+
},
282+
"default": {
283+
"description": "Error.",
284+
"schema": {
285+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
286+
}
263287
}
264288
}
265289
}
@@ -303,6 +327,12 @@
303327
"schema": {
304328
"$ref": "#/definitions/FunctionListResult"
305329
}
330+
},
331+
"default": {
332+
"description": "Error.",
333+
"schema": {
334+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
335+
}
306336
}
307337
},
308338
"x-ms-pageable": {
@@ -360,12 +390,18 @@
360390
},
361391
"202": {
362392
"description": "The test request was successfully initiated."
393+
},
394+
"default": {
395+
"description": "Error.",
396+
"schema": {
397+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
398+
}
363399
}
364400
},
365401
"x-ms-long-running-operation": true
366402
}
367403
},
368-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StreamAnalytics/streamingjobs/{jobName}/functions/{functionName}/RetrieveDefaultDefinition": {
404+
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StreamAnalytics/streamingjobs/{jobName}/functions/{functionName}/retrieveDefaultDefinition": {
369405
"post": {
370406
"tags": [
371407
"Functions"
@@ -409,6 +445,12 @@
409445
"schema": {
410446
"$ref": "#/definitions/Function"
411447
}
448+
},
449+
"default": {
450+
"description": "Error.",
451+
"schema": {
452+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
453+
}
412454
}
413455
}
414456
}
@@ -442,7 +484,10 @@
442484
"type": "string",
443485
"description": "The current entity tag for the function. This is an opaque string. You can use it to detect whether the resource has changed between requests. You can also use it in the If-Match or If-None-Match headers for write operations for optimistic concurrency."
444486
}
445-
}
487+
},
488+
"required": [
489+
"type"
490+
]
446491
},
447492
"ScalarFunctionProperties": {
448493
"description": "The properties that are associated with a scalar function.",
@@ -510,7 +555,10 @@
510555
"type": "string",
511556
"description": "Indicates the function binding type."
512557
}
513-
}
558+
},
559+
"required": [
560+
"type"
561+
]
514562
},
515563
"AzureMachineLearningWebServiceFunctionBinding": {
516564
"description": "The binding to an Azure Machine Learning web service.",
@@ -637,7 +685,10 @@
637685
"type": "string",
638686
"description": "Indicates the function binding type."
639687
}
640-
}
688+
},
689+
"required": [
690+
"bindingType"
691+
]
641692
},
642693
"AzureMachineLearningWebServiceFunctionRetrieveDefaultDefinitionParameters": {
643694
"description": "The parameters needed to retrieve the default function definition for an Azure Machine Learning web service function.",

specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2016-03-01/inputs.json

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
"type": "string"
121121
}
122122
}
123+
},
124+
"default": {
125+
"description": "Error.",
126+
"schema": {
127+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
128+
}
123129
}
124130
}
125131
},
@@ -189,6 +195,12 @@
189195
"type": "string"
190196
}
191197
}
198+
},
199+
"default": {
200+
"description": "Error.",
201+
"schema": {
202+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
203+
}
192204
}
193205
}
194206
},
@@ -226,6 +238,12 @@
226238
},
227239
"204": {
228240
"description": "The input does not exist."
241+
},
242+
"default": {
243+
"description": "Error.",
244+
"schema": {
245+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
246+
}
229247
}
230248
}
231249
},
@@ -278,6 +296,12 @@
278296
"type": "string"
279297
}
280298
}
299+
},
300+
"default": {
301+
"description": "Error.",
302+
"schema": {
303+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
304+
}
281305
}
282306
}
283307
}
@@ -324,6 +348,12 @@
324348
"schema": {
325349
"$ref": "#/definitions/InputListResult"
326350
}
351+
},
352+
"default": {
353+
"description": "Error.",
354+
"schema": {
355+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
356+
}
327357
}
328358
},
329359
"x-ms-pageable": {
@@ -378,6 +408,12 @@
378408
},
379409
"202": {
380410
"description": "The test request was successfully initiated."
411+
},
412+
"default": {
413+
"description": "Error.",
414+
"schema": {
415+
"$ref": "../../common/v1/definitions.json#/definitions/Error"
416+
}
381417
}
382418
},
383419
"x-ms-long-running-operation": true
@@ -421,7 +457,10 @@
421457
"type": "string",
422458
"description": "The current entity tag for the input. This is an opaque string. You can use it to detect whether the resource has changed between requests. You can also use it in the If-Match or If-None-Match headers for write operations for optimistic concurrency."
423459
}
424-
}
460+
},
461+
"required": [
462+
"type"
463+
]
425464
},
426465
"StreamInputProperties": {
427466
"description": "The properties that are associated with an input containing stream data.",
@@ -461,7 +500,10 @@
461500
"type": "string",
462501
"description": "Indicates the type of input data source containing stream data. Required on PUT (CreateOrReplace) requests."
463502
}
464-
}
503+
},
504+
"required": [
505+
"type"
506+
]
465507
},
466508
"BlobStreamInputDataSource": {
467509
"description": "Describes a blob input data source that contains stream data.",
@@ -573,7 +615,10 @@
573615
"type": "string",
574616
"description": "Indicates the type of input data source containing reference data. Required on PUT (CreateOrReplace) requests."
575617
}
576-
}
618+
},
619+
"required": [
620+
"type"
621+
]
577622
},
578623
"BlobReferenceInputDataSource": {
579624
"description": "Describes a blob input data source that contains reference data.",
@@ -728,9 +773,25 @@
728773
"discriminator": "type",
729774
"properties": {
730775
"type": {
731-
"type": "string",
732-
"description": "Indicates the type of serialization that the input or output uses. Required on PUT (CreateOrReplace) requests."
776+
"description": "Indicates the type of serialization that the input or output uses. Required on PUT (CreateOrReplace) requests.",
777+
"$ref": "#/definitions/EventSerializationType"
733778
}
779+
},
780+
"required": [
781+
"type"
782+
]
783+
},
784+
"EventSerializationType": {
785+
"type": "string",
786+
"description": "Indicates the type of serialization that the input or output uses. Required on PUT (CreateOrReplace) requests.",
787+
"enum": [
788+
"Csv",
789+
"Avro",
790+
"Json"
791+
],
792+
"x-ms-enum": {
793+
"name": "EventSerializationType",
794+
"modelAsString": true
734795
}
735796
},
736797
"CsvSerialization": {

0 commit comments

Comments
 (0)