Skip to content

Commit 58a1320

Browse files
roslynluRoslyn Lu
roslynlu
and
Roslyn Lu
authored
S360 Fixes for Microsoft.StreamAnalytics (#19556)
* update enum name * update cluster max size and add default values * add gateway message bus * tenantId and principalId to readonly * add blobpathprefix * add file ref input * add missed example files Co-authored-by: Roslyn Lu <[email protected]>
1 parent 840f335 commit 58a1320

File tree

14 files changed

+393
-13
lines changed

14 files changed

+393
-13
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"x-ms-enum": {
3636
"name": "AuthenticationMode",
3737
"modelAsString": true
38-
}
38+
},
39+
"default": "ConnectionString"
3940
},
4041
"Resource": {
4142
"type": "object",

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2020-03-01-preview/clusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
"type": "integer",
499499
"format": "int32",
500500
"minimum": 36,
501-
"maximum": 216
501+
"maximum": 396
502502
}
503503
}
504504
},

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/examples/Input_Create_Reference_File.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-03-01",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg8440",
6+
"jobName": "sj9597",
7+
"inputName": "input7225",
8+
"input": {
9+
"properties": {
10+
"type": "Reference",
11+
"datasource": {
12+
"type": "File",
13+
"properties": {
14+
"path": "my/path"
15+
}
16+
}
17+
}
18+
}
19+
},
20+
"responses": {
21+
"201": {
22+
"headers": {
23+
"ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
24+
},
25+
"body": {
26+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
27+
"name": "input7225",
28+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
29+
"properties": {
30+
"type": "Reference",
31+
"datasource": {
32+
"type": "File",
33+
"properties": {
34+
"path": "my/path"
35+
}
36+
}
37+
}
38+
}
39+
},
40+
"200": {
41+
"headers": {
42+
"ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
43+
},
44+
"body": {
45+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
46+
"name": "input7225",
47+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
48+
"properties": {
49+
"type": "Reference",
50+
"datasource": {
51+
"type": "File",
52+
"properties": {
53+
"path": "my/path"
54+
}
55+
}
56+
}
57+
}
58+
}
59+
}
60+
}

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/inputs.json

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
},
5959
"Create an Event Grid input": {
6060
"$ref": "./examples/Input_Create_EventGrid.json"
61+
},
62+
"Create a reference file input": {
63+
"$ref": "./examples/Input_Create_Reference_File.json"
6164
}
6265
},
6366
"parameters": [
@@ -690,6 +693,33 @@
690693
"type"
691694
]
692695
},
696+
"FileReferenceInputDataSource": {
697+
"type": "object",
698+
"description": "Describes a file input data source that contains reference data.",
699+
"x-ms-discriminator-value": "File",
700+
"allOf": [
701+
{
702+
"$ref": "#/definitions/ReferenceInputDataSource"
703+
}
704+
],
705+
"properties": {
706+
"properties": {
707+
"$ref": "#/definitions/FileReferenceInputDataSourceProperties",
708+
"description": "The properties that are associated with a file input containing reference data. Required on PUT (CreateOrReplace) requests.",
709+
"x-ms-client-flatten": true
710+
}
711+
}
712+
},
713+
"FileReferenceInputDataSourceProperties": {
714+
"type": "object",
715+
"description": "The properties that are associated with a file input containing reference data.",
716+
"properties": {
717+
"path": {
718+
"type": "string",
719+
"description": "The path of the file."
720+
}
721+
}
722+
},
693723
"BlobReferenceInputDataSource": {
694724
"type": "object",
695725
"description": "Describes a blob input data source that contains reference data.",
@@ -1185,7 +1215,8 @@
11851215
"x-ms-enum": {
11861216
"name": "CompressionType",
11871217
"modelAsString": true
1188-
}
1218+
},
1219+
"default": "None"
11891220
},
11901221
"AzureSqlReferenceInputDataSource": {
11911222
"type": "object",

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/streamingjobs.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,11 +936,13 @@
936936
"properties": {
937937
"tenantId": {
938938
"type": "string",
939-
"description": "The tenantId of the identity."
939+
"description": "The tenantId of the identity.",
940+
"readOnly": true
940941
},
941942
"principalId": {
942943
"type": "string",
943-
"description": "The principalId of the identity."
944+
"description": "The principalId of the identity.",
945+
"readOnly": true
944946
},
945947
"type": {
946948
"type": "string",
@@ -1007,7 +1009,7 @@
10071009
"Nonblocking"
10081010
],
10091011
"x-ms-enum": {
1010-
"name": "RefreshType",
1012+
"name": "UpdatableUdfRefreshType",
10111013
"modelAsString": true
10121014
}
10131015
}

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/transformations.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@
261261
"streamingUnits": {
262262
"type": "integer",
263263
"format": "int32",
264-
"description": "Specifies the number of streaming units that the streaming job uses."
264+
"description": "Specifies the number of streaming units that the streaming job uses.",
265+
"default": 3
265266
},
266267
"validStreamingUnits": {
267268
"type": "array",

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/clusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505
"type": "integer",
506506
"format": "int32",
507507
"minimum": 36,
508-
"maximum": 216
508+
"maximum": 396
509509
}
510510
}
511511
},

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_GatewayMessageBus.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01-preview",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg3467",
6+
"jobName": "sj9742",
7+
"inputName": "input7970",
8+
"input": {
9+
"properties": {
10+
"type": "Stream",
11+
"datasource": {
12+
"type": "GatewayMessageBus",
13+
"properties": {
14+
"topic": "EdgeTopic1"
15+
}
16+
}
17+
}
18+
}
19+
},
20+
"responses": {
21+
"201": {
22+
"headers": {
23+
"ETag": "bd8009b3-8165-4bd3-aad2-29a2b378dd14"
24+
},
25+
"body": {
26+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg3467/providers/Microsoft.StreamAnalytics/streamingjobs/sj9742/inputs/input7970",
27+
"name": "input7970",
28+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
29+
"properties": {
30+
"type": "Stream",
31+
"datasource": {
32+
"type": "GatewayMessageBus",
33+
"properties": {
34+
"topic": "EdgeTopic1"
35+
}
36+
}
37+
}
38+
}
39+
},
40+
"200": {
41+
"headers": {
42+
"ETag": "bd8009b3-8165-4bd3-aad2-29a2b378dd14"
43+
},
44+
"body": {
45+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg3467/providers/Microsoft.StreamAnalytics/streamingjobs/sj9742/inputs/input7970",
46+
"name": "input7970",
47+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
48+
"properties": {
49+
"type": "Stream",
50+
"datasource": {
51+
"type": "GatewayMessageBus",
52+
"properties": {
53+
"topic": "EdgeTopic1"
54+
}
55+
}
56+
}
57+
}
58+
}
59+
}
60+
}

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_Reference_File.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-03-01",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg8440",
6+
"jobName": "sj9597",
7+
"inputName": "input7225",
8+
"input": {
9+
"properties": {
10+
"type": "Reference",
11+
"datasource": {
12+
"type": "File",
13+
"properties": {
14+
"path": "my/path"
15+
}
16+
}
17+
}
18+
}
19+
},
20+
"responses": {
21+
"201": {
22+
"headers": {
23+
"ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
24+
},
25+
"body": {
26+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
27+
"name": "input7225",
28+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
29+
"properties": {
30+
"type": "Reference",
31+
"datasource": {
32+
"type": "File",
33+
"properties": {
34+
"path": "my/path"
35+
}
36+
}
37+
}
38+
}
39+
},
40+
"200": {
41+
"headers": {
42+
"ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
43+
},
44+
"body": {
45+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
46+
"name": "input7225",
47+
"type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
48+
"properties": {
49+
"type": "Reference",
50+
"datasource": {
51+
"type": "File",
52+
"properties": {
53+
"path": "my/path"
54+
}
55+
}
56+
}
57+
}
58+
}
59+
}
60+
}

‎specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Output_Create_GatewayMessageBus.json

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01-preview",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg7983",
6+
"jobName": "sj2331",
7+
"outputName": "output3022",
8+
"output": {
9+
"properties": {
10+
"datasource": {
11+
"type": "GatewayMessageBus",
12+
"properties": {
13+
"topic": "EdgeTopic1"
14+
}
15+
}
16+
}
17+
}
18+
},
19+
"responses": {
20+
"201": {
21+
"headers": {
22+
"ETag": "ccf8b864-259e-43c5-a628-ba10858b2c07"
23+
},
24+
"body": {
25+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg7983/providers/Microsoft.StreamAnalytics/streamingjobs/sj2331/outputs/output3022",
26+
"name": "output3022",
27+
"type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
28+
"properties": {
29+
"datasource": {
30+
"type": "GatewayMessageBus",
31+
"properties": {
32+
"topic": "EdgeTopic1"
33+
}
34+
}
35+
}
36+
}
37+
},
38+
"200": {
39+
"headers": {
40+
"ETag": "ccf8b864-259e-43c5-a628-ba10858b2c07"
41+
},
42+
"body": {
43+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg7983/providers/Microsoft.StreamAnalytics/streamingjobs/sj2331/outputs/output3022",
44+
"name": "output3022",
45+
"type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
46+
"properties": {
47+
"datasource": {
48+
"type": "GatewayMessageBus",
49+
"properties": {
50+
"topic": "EdgeTopic1"
51+
}
52+
}
53+
}
54+
}
55+
}
56+
}
57+
}

0 commit comments

Comments
 (0)