Skip to content

Commit ced38c4

Browse files
roslynluRoslyn Lu
andauthored
[Stream Analytics] S360 fixes for identity, adx output, location header (#24260)
* add adx * uai fixes and ex file * fix some model validation errors * add location header * missed header --------- Co-authored-by: Roslyn Lu <[email protected]>
1 parent b8e1a19 commit ced38c4

20 files changed

+349
-29
lines changed

specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2017-04-01-preview/examples/Input_Test.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"responses": {
1010
"200": {
1111
"headers": {
12-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/inputs/inputName?api-version=2017-04-01-preview"
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2017-04-01-preview"
1313
},
1414
"body": {
1515
"status": "TestSucceeded"
1616
}
1717
},
1818
"202": {
1919
"headers": {
20-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/inputs/inputName?api-version=2017-04-01-preview"
20+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2017-04-01-preview"
2121
}
2222
}
2323
}

specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2017-04-01-preview/examples/Output_Test.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"responses": {
1010
"200": {
1111
"headers": {
12-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/outputs/outputName?api-version=2017-04-01-preview"
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2017-04-01-preview"
1313
},
1414
"body": {
1515
"status": "TestSucceeded"
1616
}
1717
},
1818
"202": {
1919
"headers": {
20-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/outputs/outputName?api-version=2017-04-01-preview"
20+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2017-04-01-preview"
2121
}
2222
}
2323
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22
"parameters": {
33
"api-version": "2021-10-01-preview",
44
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5-
"resourceGroupName": "sjrg7",
6-
"jobName": "sj9093",
5+
"resourceGroupName": "sjrg",
6+
"jobName": "sjName",
77
"functionName": "function588"
88
},
99
"responses": {
1010
"200": {
11+
"headers": {
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
13+
},
1114
"body": {
1215
"status": "TestSucceeded"
1316
}
1417
},
15-
"202": {}
18+
"202": {
19+
"headers": {
20+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
21+
}
22+
}
1623
}
1724
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
},
99
"responses": {
1010
"200": {
11+
"headers": {
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
13+
},
1114
"body": {
1215
"status": "TestFailed",
1316
"error": {
@@ -16,6 +19,10 @@
1619
}
1720
}
1821
},
19-
"202": {}
22+
"202": {
23+
"headers": {
24+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
25+
}
26+
}
2027
}
2128
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"responses": {
1010
"200": {
1111
"headers": {
12-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/inputs/inputName?api-version=2021-10-01-preview"
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
1313
},
1414
"body": {
1515
"status": "TestSucceeded"
1616
}
1717
},
1818
"202": {
1919
"headers": {
20-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/inputs/inputName?api-version=2021-10-01-preview"
20+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
2121
}
2222
}
2323
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01-preview",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg",
6+
"jobName": "sjName",
7+
"outputName": "adxOutput",
8+
"output": {
9+
"properties": {
10+
"datasource": {
11+
"type": "Microsoft.Kusto/clusters/databases",
12+
"properties": {
13+
"cluster": "https://asakustotest.eastus.kusto.windows.net",
14+
"database": "dbname",
15+
"table": "mytable",
16+
"authenticationMode": "Msi"
17+
}
18+
}
19+
}
20+
}
21+
},
22+
"responses": {
23+
"201": {
24+
"headers": {
25+
"ETag": "731a47c6-ff67-4439-bde6-a2a3da4c1ecf"
26+
},
27+
"body": {
28+
"id": "/subscriptions/7f31cba8-b597-4129-b158-8f21a7395bd0/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/outputs/adxOutput",
29+
"name": "adxOutput",
30+
"type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
31+
"properties": {
32+
"datasource": {
33+
"type": "Microsoft.Kusto/clusters/databases",
34+
"properties": {
35+
"cluster": "https://asakustotest.eastus.kusto.windows.net",
36+
"database": "dbname",
37+
"table": "mytable",
38+
"authenticationMode": "Msi"
39+
}
40+
},
41+
"etag": "7b912929-346d-432e-9495-6972dbd63179"
42+
}
43+
}
44+
},
45+
"200": {
46+
"headers": {
47+
"ETag": "731a47c6-ff67-4439-bde6-a2a3da4c1ecf"
48+
},
49+
"body": {
50+
"id": "/subscriptions/7f31cba8-b597-4129-b158-8f21a7395bd0/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/outputs/adxOutput",
51+
"name": "adxOutput",
52+
"type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
53+
"properties": {
54+
"datasource": {
55+
"type": "Microsoft.Kusto/clusters/databases",
56+
"properties": {
57+
"cluster": "https://asakustotest.eastus.kusto.windows.net",
58+
"database": "dbname",
59+
"table": "mytable",
60+
"authenticationMode": "Msi"
61+
}
62+
},
63+
"etag": "7b912929-346d-432e-9495-6972dbd63179"
64+
}
65+
}
66+
}
67+
}
68+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"responses": {
1010
"200": {
1111
"headers": {
12-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/outputs/outputName?api-version=2021-10-01-preview"
12+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
1313
},
1414
"body": {
1515
"status": "TestSucceeded"
1616
}
1717
},
1818
"202": {
1919
"headers": {
20-
"Location": "https://management.azure.com/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.StreamAnalytics/streamingjobs/jobName/outputs/outputName?api-version=2021-10-01-preview"
20+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
2121
}
2222
}
2323
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01-preview",
4+
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5+
"resourceGroupName": "sjrg",
6+
"jobName": "sjName",
7+
"streamingJob": {
8+
"properties": {
9+
"sku": {
10+
"name": "Standard"
11+
},
12+
"eventsOutOfOrderPolicy": "Drop",
13+
"outputErrorPolicy": "Drop",
14+
"eventsOutOfOrderMaxDelayInSeconds": 5,
15+
"eventsLateArrivalMaxDelayInSeconds": 16,
16+
"dataLocale": "en-US",
17+
"compatibilityLevel": "1.0",
18+
"inputs": [],
19+
"outputs": [],
20+
"functions": []
21+
},
22+
"location": "West US",
23+
"tags": {
24+
"key1": "value1",
25+
"randomKey": "randomValue",
26+
"key3": "value3"
27+
},
28+
"identity": {
29+
"type": "UserAssigned",
30+
"userAssignedIdentities": {
31+
"/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/akvenkat/providers/Microsoft.ManagedIdentity/userAssignedIdentities/sdkIdentity": {}
32+
}
33+
}
34+
}
35+
},
36+
"responses": {
37+
"201": {
38+
"headers": {
39+
"ETag": "3e6872bc-c9d0-45b6-91b6-da66f1773056"
40+
},
41+
"body": {
42+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName",
43+
"name": "sjName",
44+
"type": "Microsoft.StreamAnalytics/streamingjobs",
45+
"location": "West US",
46+
"tags": {
47+
"key1": "value1",
48+
"randomKey": "randomValue",
49+
"key3": "value3"
50+
},
51+
"identity": {
52+
"principalId": "c10a9ec7-7136-441f-9e90-d17cd1a51b94",
53+
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
54+
"type": "UserAssigned",
55+
"userAssignedIdentities": {
56+
"/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/akvenkat/providers/Microsoft.ManagedIdentity/userAssignedIdentities/sdkIdentity": {}
57+
}
58+
},
59+
"properties": {
60+
"sku": {
61+
"name": "Standard"
62+
},
63+
"jobId": "d53ecc3c-fcb0-485d-9caf-25e20fcb2061",
64+
"provisioningState": "Succeeded",
65+
"jobState": "Created",
66+
"eventsOutOfOrderPolicy": "Drop",
67+
"outputErrorPolicy": "Drop",
68+
"eventsOutOfOrderMaxDelayInSeconds": 5,
69+
"eventsLateArrivalMaxDelayInSeconds": 16,
70+
"dataLocale": "en-US",
71+
"createdDate": "2017-05-11T04:37:04.697Z",
72+
"compatibilityLevel": "1.0",
73+
"inputs": [],
74+
"functions": [],
75+
"outputs": []
76+
}
77+
}
78+
},
79+
"200": {
80+
"headers": {
81+
"ETag": "3e6872bc-c9d0-45b6-91b6-da66f1773056"
82+
},
83+
"body": {
84+
"id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName",
85+
"name": "sjName",
86+
"type": "Microsoft.StreamAnalytics/streamingjobs",
87+
"location": "West US",
88+
"tags": {
89+
"key1": "value1",
90+
"randomKey": "randomValue",
91+
"key3": "value3"
92+
},
93+
"identity": {
94+
"principalId": "c10a9ec7-7136-441f-9e90-d17cd1a51b94",
95+
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
96+
"type": "UserAssigned",
97+
"userAssignedIdentities": {
98+
"/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/akvenkat/providers/Microsoft.ManagedIdentity/userAssignedIdentities/sdkIdentity": {}
99+
}
100+
},
101+
"properties": {
102+
"sku": {
103+
"name": "Standard"
104+
},
105+
"jobId": "d53ecc3c-fcb0-485d-9caf-25e20fcb2061",
106+
"provisioningState": "Succeeded",
107+
"jobState": "Created",
108+
"eventsOutOfOrderPolicy": "Drop",
109+
"outputErrorPolicy": "Drop",
110+
"eventsOutOfOrderMaxDelayInSeconds": 5,
111+
"eventsLateArrivalMaxDelayInSeconds": 16,
112+
"dataLocale": "en-US",
113+
"createdDate": "2017-05-11T04:37:04.697Z",
114+
"compatibilityLevel": "1.0",
115+
"inputs": [],
116+
"functions": [],
117+
"outputs": []
118+
}
119+
}
120+
}
121+
}
122+
}

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,20 @@
66
"jobName": "sj59"
77
},
88
"responses": {
9-
"200": {},
10-
"202": {},
11-
"204": {}
9+
"200": {
10+
"headers": {
11+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
12+
}
13+
},
14+
"202": {
15+
"headers": {
16+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
17+
}
18+
},
19+
"204": {
20+
"headers": {
21+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
22+
}
23+
}
1224
}
1325
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
"parameters": {
33
"api-version": "2021-10-01-preview",
44
"subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
5-
"resourceGroupName": "sjrg6936",
6-
"jobName": "sj59",
5+
"resourceGroupName": "sjrg",
6+
"jobName": "sjName",
77
"scaleJobParameters": {
88
"streamingUnits": 36
99
}
1010
},
1111
"responses": {
12-
"200": {},
13-
"202": {}
12+
"200": {
13+
"headers": {
14+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
15+
}
16+
},
17+
"202": {
18+
"headers": {
19+
"Location": "https://management.azure.com/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg/providers/Microsoft.StreamAnalytics/streamingjobs/sjName/OperationResults/0cc50cef-de8c-48d4-b60b-7750cbaf4f76?api-version=2021-10-01-preview"
20+
}
21+
}
1422
}
1523
}

0 commit comments

Comments
 (0)