Skip to content

Commit 903e392

Browse files
author
msftbot[bot]
authored
[ReleasePR streamanalytics] S360 Fixes for Microsoft.StreamAnalytics (#2463)
Create to sync Azure/azure-rest-api-specs#19556 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...azure-sdk:sdkAuto/streamanalytics?expand=1)
2 parents 9f70075 + a8f1f35 commit 903e392

File tree

3 files changed

+165
-24
lines changed

3 files changed

+165
-24
lines changed

schemas/2020-03-01-preview/Microsoft.StreamAnalytics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
{
155155
"type": "integer",
156156
"minimum": 36,
157-
"maximum": 216
157+
"maximum": 396
158158
},
159159
{
160160
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

schemas/2020-03-01/Microsoft.StreamAnalytics.json

Lines changed: 122 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,10 @@
10321032
],
10331033
"description": "Authentication Mode."
10341034
},
1035+
"blobPathPrefix": {
1036+
"type": "string",
1037+
"description": "Blob path prefix."
1038+
},
10351039
"container": {
10361040
"type": "string",
10371041
"description": "The name of a container within the associated Storage account. This container contains either the blob(s) to be read from or written to. Required on PUT (CreateOrReplace) requests."
@@ -1272,7 +1276,7 @@
12721276
{
12731277
"type": "integer",
12741278
"minimum": 36,
1275-
"maximum": 216
1279+
"maximum": 396
12761280
},
12771281
{
12781282
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1669,6 +1673,42 @@
16691673
],
16701674
"description": "Describes an Event Hub input data source that contains stream data."
16711675
},
1676+
"FileReferenceInputDataSource": {
1677+
"type": "object",
1678+
"properties": {
1679+
"properties": {
1680+
"oneOf": [
1681+
{
1682+
"$ref": "#/definitions/FileReferenceInputDataSourceProperties"
1683+
},
1684+
{
1685+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1686+
}
1687+
],
1688+
"description": "The properties that are associated with a file input containing reference data."
1689+
},
1690+
"type": {
1691+
"type": "string",
1692+
"enum": [
1693+
"File"
1694+
]
1695+
}
1696+
},
1697+
"required": [
1698+
"type"
1699+
],
1700+
"description": "Describes a file input data source that contains reference data."
1701+
},
1702+
"FileReferenceInputDataSourceProperties": {
1703+
"type": "object",
1704+
"properties": {
1705+
"path": {
1706+
"type": "string",
1707+
"description": "The path of the file."
1708+
}
1709+
},
1710+
"description": "The properties that are associated with a file input containing reference data."
1711+
},
16721712
"Function": {
16731713
"type": "object",
16741714
"properties": {
@@ -1798,17 +1838,81 @@
17981838
},
17991839
"description": "The properties that are associated with a function."
18001840
},
1801-
"Identity": {
1841+
"GatewayMessageBusOutputDataSource": {
18021842
"type": "object",
18031843
"properties": {
1804-
"principalId": {
1805-
"type": "string",
1806-
"description": "The identity principal ID"
1844+
"properties": {
1845+
"oneOf": [
1846+
{
1847+
"$ref": "#/definitions/GatewayMessageBusOutputDataSourceProperties"
1848+
},
1849+
{
1850+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1851+
}
1852+
],
1853+
"description": "The properties that are associated with a Gateway Message Bus."
18071854
},
1808-
"tenantId": {
1855+
"type": {
18091856
"type": "string",
1810-
"description": "The identity tenantId"
1857+
"enum": [
1858+
"GatewayMessageBus"
1859+
]
1860+
}
1861+
},
1862+
"required": [
1863+
"type"
1864+
],
1865+
"description": "Describes a Gateway Message Bus output data source."
1866+
},
1867+
"GatewayMessageBusOutputDataSourceProperties": {
1868+
"type": "object",
1869+
"properties": {
1870+
"topic": {
1871+
"type": "string",
1872+
"description": "The name of the Service Bus topic."
1873+
}
1874+
},
1875+
"description": "The properties that are associated with a Gateway Message Bus."
1876+
},
1877+
"GatewayMessageBusStreamInputDataSource": {
1878+
"type": "object",
1879+
"properties": {
1880+
"properties": {
1881+
"oneOf": [
1882+
{
1883+
"$ref": "#/definitions/GatewayMessageBusStreamInputDataSourceProperties"
1884+
},
1885+
{
1886+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1887+
}
1888+
],
1889+
"description": "The properties that are associated with a gateway message bus input containing stream data."
18111890
},
1891+
"type": {
1892+
"type": "string",
1893+
"enum": [
1894+
"GatewayMessageBus"
1895+
]
1896+
}
1897+
},
1898+
"required": [
1899+
"type"
1900+
],
1901+
"description": "Describes a blob input data source that contains stream data."
1902+
},
1903+
"GatewayMessageBusStreamInputDataSourceProperties": {
1904+
"type": "object",
1905+
"properties": {
1906+
"topic": {
1907+
"type": "string",
1908+
"description": "The name of the Service Bus topic."
1909+
}
1910+
},
1911+
"description": "The properties that are associated with a gateway message bus input containing stream data."
1912+
},
1913+
"Identity": {
1914+
"type": "object",
1915+
"properties": {
18121916
"type": {
18131917
"type": "string",
18141918
"description": "The identity type"
@@ -2115,6 +2219,9 @@
21152219
},
21162220
{
21172221
"$ref": "#/definitions/AzureDataLakeStoreOutputDataSource"
2222+
},
2223+
{
2224+
"$ref": "#/definitions/GatewayMessageBusOutputDataSource"
21182225
}
21192226
],
21202227
"properties": {},
@@ -2339,6 +2446,9 @@
23392446
"ReferenceInputDataSource": {
23402447
"type": "object",
23412448
"oneOf": [
2449+
{
2450+
"$ref": "#/definitions/FileReferenceInputDataSource"
2451+
},
23422452
{
23432453
"$ref": "#/definitions/BlobReferenceInputDataSource"
23442454
},
@@ -3003,6 +3113,9 @@
30033113
},
30043114
{
30053115
"$ref": "#/definitions/IoTHubStreamInputDataSource"
3116+
},
3117+
{
3118+
"$ref": "#/definitions/GatewayMessageBusStreamInputDataSource"
30063119
}
30073120
],
30083121
"properties": {},
@@ -3065,7 +3178,8 @@
30653178
"streamingUnits": {
30663179
"oneOf": [
30673180
{
3068-
"type": "integer"
3181+
"type": "integer",
3182+
"default": "3"
30693183
},
30703184
{
30713185
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

schemas/2021-10-01-preview/Microsoft.StreamAnalytics.json

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -880,9 +880,7 @@
880880
"enum": [
881881
"Static",
882882
"RefreshPeriodicallyWithFull",
883-
"RefreshPeriodicallyWithDelta",
884-
"Blocking",
885-
"Nonblocking"
883+
"RefreshPeriodicallyWithDelta"
886884
]
887885
},
888886
{
@@ -1950,6 +1948,42 @@
19501948
},
19511949
"description": "The storage account where the custom code artifacts are located."
19521950
},
1951+
"FileReferenceInputDataSource": {
1952+
"type": "object",
1953+
"properties": {
1954+
"properties": {
1955+
"oneOf": [
1956+
{
1957+
"$ref": "#/definitions/FileReferenceInputDataSourceProperties"
1958+
},
1959+
{
1960+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1961+
}
1962+
],
1963+
"description": "The properties that are associated with a file input containing reference data."
1964+
},
1965+
"type": {
1966+
"type": "string",
1967+
"enum": [
1968+
"File"
1969+
]
1970+
}
1971+
},
1972+
"required": [
1973+
"type"
1974+
],
1975+
"description": "Describes a file input data source that contains reference data."
1976+
},
1977+
"FileReferenceInputDataSourceProperties": {
1978+
"type": "object",
1979+
"properties": {
1980+
"path": {
1981+
"type": "string",
1982+
"description": "The path of the file."
1983+
}
1984+
},
1985+
"description": "The properties that are associated with a file input containing reference data."
1986+
},
19531987
"Function": {
19541988
"type": "object",
19551989
"properties": {
@@ -2160,14 +2194,6 @@
21602194
"Identity": {
21612195
"type": "object",
21622196
"properties": {
2163-
"principalId": {
2164-
"type": "string",
2165-
"description": "The principalId of the identity."
2166-
},
2167-
"tenantId": {
2168-
"type": "string",
2169-
"description": "The tenantId of the identity."
2170-
},
21712197
"type": {
21722198
"type": "string",
21732199
"description": "The type of identity, can be SystemAssigned or UserAssigned."
@@ -2885,6 +2911,9 @@
28852911
"ReferenceInputDataSource": {
28862912
"type": "object",
28872913
"oneOf": [
2914+
{
2915+
"$ref": "#/definitions/FileReferenceInputDataSource"
2916+
},
28882917
{
28892918
"$ref": "#/definitions/BlobReferenceInputDataSource"
28902919
},
@@ -2944,9 +2973,6 @@
29442973
{
29452974
"type": "string",
29462975
"enum": [
2947-
"Static",
2948-
"RefreshPeriodicallyWithFull",
2949-
"RefreshPeriodicallyWithDelta",
29502976
"Blocking",
29512977
"Nonblocking"
29522978
]
@@ -3693,7 +3719,8 @@
36933719
"streamingUnits": {
36943720
"oneOf": [
36953721
{
3696-
"type": "integer"
3722+
"type": "integer",
3723+
"default": "3"
36973724
},
36983725
{
36993726
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

0 commit comments

Comments
 (0)