diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index c3c5bc227ce9..d4c14200a5fb 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -9114,19 +9114,19 @@ packages: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 '@microsoft/api-extractor': 7.19.4 - '@rollup/plugin-commonjs': 21.0.1_rollup@2.67.1 - '@rollup/plugin-json': 4.1.0_rollup@2.67.1 - '@rollup/plugin-multi-entry': 4.1.0_rollup@2.67.1 - '@rollup/plugin-node-resolve': 13.1.3_rollup@2.67.1 + '@rollup/plugin-commonjs': 21.0.2_rollup@2.70.1 + '@rollup/plugin-json': 4.1.0_rollup@2.70.1 + '@rollup/plugin-multi-entry': 4.1.0_rollup@2.70.1 + '@rollup/plugin-node-resolve': 13.1.3_rollup@2.70.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.67.1 - rollup-plugin-sourcemaps: 0.6.3_rollup@2.67.1 + rollup: 2.70.1 + rollup-plugin-sourcemaps: 0.6.3_rollup@2.70.1 tslib: 2.3.1 typescript: 4.2.4 - uglify-js: 3.15.1 + uglify-js: 3.15.3 transitivePeerDependencies: - '@types/node' - debug @@ -13052,23 +13052,23 @@ packages: dev: false file:projects/arm-streamanalytics.tgz: - resolution: {integrity: sha512-XBZrgYoxqnD+oAxDHlN/yC+yKVf9KdllU/L5TCfOCKZKkTxlWv43E3Z9l4YLI8QVQQcp932FVzse7aGcoEqcMA==, tarball: file:projects/arm-streamanalytics.tgz} + resolution: {integrity: sha512-CEyZyMM9/qWpAeIFLVbJtEAnKXJlbOYmfeCc6dOXm8aH1Zg+Wi2ZcWJWSiQQLrxWxuXw3ECN3qkPePqHTxr4Iw==, tarball: file:projects/arm-streamanalytics.tgz} name: '@rush-temp/arm-streamanalytics' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 '@microsoft/api-extractor': 7.19.4 - '@rollup/plugin-commonjs': 21.0.2_rollup@2.70.1 - '@rollup/plugin-json': 4.1.0_rollup@2.70.1 - '@rollup/plugin-multi-entry': 3.0.1_rollup@2.70.1 - '@rollup/plugin-node-resolve': 8.4.0_rollup@2.70.1 + '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1 + '@rollup/plugin-json': 4.1.0_rollup@1.32.1 + '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1 + '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.70.1 - rollup-plugin-sourcemaps: 0.4.2_rollup@2.70.1 + rollup: 1.32.1 + rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1 tslib: 2.3.1 typescript: 4.2.4 uglify-js: 3.15.3 diff --git a/sdk/streamanalytics/arm-streamanalytics/CHANGELOG.md b/sdk/streamanalytics/arm-streamanalytics/CHANGELOG.md index e1e1f2bb7123..0a78280bb1a0 100644 --- a/sdk/streamanalytics/arm-streamanalytics/CHANGELOG.md +++ b/sdk/streamanalytics/arm-streamanalytics/CHANGELOG.md @@ -1,15 +1,19 @@ # Release History - -## 4.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + +## 4.1.0 (2022-03-25) + +**Features** + + - Added Type Alias AggregateFunctionProperties + - Added Type Alias AzureFunctionOutputDataSource + - Interface BlobDataSourceProperties has a new optional parameter authenticationMode + - Interface FunctionProperties has a new optional parameter binding + - Interface FunctionProperties has a new optional parameter inputs + - Interface FunctionProperties has a new optional parameter output + - Type Alias BlobReferenceInputDataSource has a new parameter authenticationMode + - Type Alias BlobStreamInputDataSource has a new parameter authenticationMode + + ## 4.0.0 (2021-12-10) The package of @azure/arm-streamanalytics is using our next generation design principles since version 4.0.0, which contains breaking changes. diff --git a/sdk/streamanalytics/arm-streamanalytics/LICENSE b/sdk/streamanalytics/arm-streamanalytics/LICENSE index ccb63b166732..5d1d36e0af80 100644 --- a/sdk/streamanalytics/arm-streamanalytics/LICENSE +++ b/sdk/streamanalytics/arm-streamanalytics/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Microsoft +Copyright (c) 2022 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/streamanalytics/arm-streamanalytics/_meta.json b/sdk/streamanalytics/arm-streamanalytics/_meta.json index 1066d2b8724b..9017600f96fa 100644 --- a/sdk/streamanalytics/arm-streamanalytics/_meta.json +++ b/sdk/streamanalytics/arm-streamanalytics/_meta.json @@ -1,7 +1,8 @@ { - "commit": "76f8e0c50629ef12aa338d55782278ceca46212a", + "commit": "80adcdcee4ebf4c120333e0f82b25ac84a940267", "readme": "specification/streamanalytics/resource-manager/readme.md", - "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/streamanalytics/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211130.1", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/streamanalytics/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211130.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.2.1", + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/streamanalytics/arm-streamanalytics/api-extractor.json b/sdk/streamanalytics/arm-streamanalytics/api-extractor.json index 2aa8197f24a7..c1db94b7a319 100644 --- a/sdk/streamanalytics/arm-streamanalytics/api-extractor.json +++ b/sdk/streamanalytics/arm-streamanalytics/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-streamanalytics.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/streamanalytics/arm-streamanalytics/package.json b/sdk/streamanalytics/arm-streamanalytics/package.json index f50fef37f073..a9dfe0b60c54 100644 --- a/sdk/streamanalytics/arm-streamanalytics/package.json +++ b/sdk/streamanalytics/arm-streamanalytics/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for StreamAnalyticsManagementClient.", - "version": "4.0.1", + "version": "4.1.0", "engines": { "node": ">=12.0.0" }, @@ -29,12 +29,12 @@ "types": "./types/arm-streamanalytics.d.ts", "devDependencies": { "@microsoft/api-extractor": "^7.18.11", - "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-json": "^4.0.0", "@rollup/plugin-multi-entry": "^3.0.0", "@rollup/plugin-node-resolve": "^8.0.0", "mkdirp": "^1.0.4", - "rollup": "^2.0.0", + "rollup": "^1.16.3", "rollup-plugin-sourcemaps": "^0.4.2", "typescript": "~4.2.0", "uglify-js": "^3.4.9", @@ -99,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/streamanalytics/arm-streamanalytics/review/arm-streamanalytics.api.md b/sdk/streamanalytics/arm-streamanalytics/review/arm-streamanalytics.api.md index 4500d2df761a..a2e70da1d281 100644 --- a/sdk/streamanalytics/arm-streamanalytics/review/arm-streamanalytics.api.md +++ b/sdk/streamanalytics/arm-streamanalytics/review/arm-streamanalytics.api.md @@ -10,6 +10,11 @@ import { PagedAsyncIterableIterator } from '@azure/core-paging'; import { PollerLike } from '@azure/core-lro'; import { PollOperationState } from '@azure/core-lro'; +// @public +export type AggregateFunctionProperties = FunctionProperties & { + type: "Aggregate"; +}; + // @public export type AuthenticationMode = string; @@ -43,6 +48,16 @@ export type AzureDataLakeStoreOutputDataSourceProperties = OAuthBasedDataSourceP authenticationMode?: AuthenticationMode; }; +// @public +export type AzureFunctionOutputDataSource = OutputDataSource & { + type: "Microsoft.AzureFunction"; + functionAppName?: string; + functionName?: string; + apiKey?: string; + maxBatchSize?: number; + maxBatchCount?: number; +}; + // @public export type AzureMachineLearningWebServiceFunctionBinding = FunctionBinding & { type: "Microsoft.MachineLearning/WebService"; @@ -157,6 +172,7 @@ export type AzureTableOutputDataSource = OutputDataSource & { // @public export interface BlobDataSourceProperties { + authenticationMode?: AuthenticationMode; container?: string; dateFormat?: string; pathPattern?: string; @@ -176,9 +192,7 @@ export type BlobOutputDataSource = OutputDataSource & { }; // @public -export type BlobOutputDataSourceProperties = BlobDataSourceProperties & { - authenticationMode?: AuthenticationMode; -}; +export type BlobOutputDataSourceProperties = BlobDataSourceProperties & {}; // @public export type BlobReferenceInputDataSource = ReferenceInputDataSource & { @@ -188,6 +202,7 @@ export type BlobReferenceInputDataSource = ReferenceInputDataSource & { pathPattern?: string; dateFormat?: string; timeFormat?: string; + authenticationMode?: AuthenticationMode; }; // @public @@ -201,6 +216,7 @@ export type BlobStreamInputDataSource = StreamInputDataSource & { pathPattern?: string; dateFormat?: string; timeFormat?: string; + authenticationMode?: AuthenticationMode; sourcePartitionCount?: number; }; @@ -519,12 +535,16 @@ export interface FunctionOutput { // @public export interface FunctionProperties { + binding?: FunctionBindingUnion; readonly etag?: string; - type: "Scalar"; + // (undocumented) + inputs?: FunctionInput[]; + output?: FunctionOutput; + type: "Scalar" | "Aggregate"; } // @public (undocumented) -export type FunctionPropertiesUnion = FunctionProperties | ScalarFunctionProperties; +export type FunctionPropertiesUnion = FunctionProperties | ScalarFunctionProperties | AggregateFunctionProperties; // @public export interface FunctionRetrieveDefaultDefinitionParameters { @@ -976,11 +996,11 @@ export type Output = SubResource & { // @public export interface OutputDataSource { - type: "Microsoft.Storage/Blob" | "Microsoft.Storage/Table" | "Microsoft.ServiceBus/EventHub" | "Microsoft.EventHub/EventHub" | "Microsoft.Sql/Server/Database" | "Microsoft.Sql/Server/DataWarehouse" | "Microsoft.Storage/DocumentDB" | "Microsoft.ServiceBus/Queue" | "Microsoft.ServiceBus/Topic" | "PowerBI" | "Microsoft.DataLake/Accounts"; + type: "Microsoft.Storage/Blob" | "Microsoft.Storage/Table" | "Microsoft.ServiceBus/EventHub" | "Microsoft.EventHub/EventHub" | "Microsoft.Sql/Server/Database" | "Microsoft.Sql/Server/DataWarehouse" | "Microsoft.Storage/DocumentDB" | "Microsoft.AzureFunction" | "Microsoft.ServiceBus/Queue" | "Microsoft.ServiceBus/Topic" | "PowerBI" | "Microsoft.DataLake/Accounts"; } // @public (undocumented) -export type OutputDataSourceUnion = OutputDataSource | BlobOutputDataSource | AzureTableOutputDataSource | EventHubOutputDataSource | EventHubV2OutputDataSource | AzureSqlDatabaseOutputDataSource | AzureSynapseOutputDataSource | DocumentDbOutputDataSource | ServiceBusQueueOutputDataSource | ServiceBusTopicOutputDataSource | PowerBIOutputDataSource | AzureDataLakeStoreOutputDataSource; +export type OutputDataSourceUnion = OutputDataSource | BlobOutputDataSource | AzureTableOutputDataSource | EventHubOutputDataSource | EventHubV2OutputDataSource | AzureSqlDatabaseOutputDataSource | AzureSynapseOutputDataSource | DocumentDbOutputDataSource | AzureFunctionOutputDataSource | ServiceBusQueueOutputDataSource | ServiceBusTopicOutputDataSource | PowerBIOutputDataSource | AzureDataLakeStoreOutputDataSource; // @public export type OutputErrorPolicy = string; @@ -1211,9 +1231,6 @@ export interface ResourceTestStatus { // @public export type ScalarFunctionProperties = FunctionProperties & { type: "Scalar"; - inputs?: FunctionInput[]; - output?: FunctionOutput; - binding?: FunctionBindingUnion; }; // @public diff --git a/sdk/streamanalytics/arm-streamanalytics/src/models/index.ts b/sdk/streamanalytics/arm-streamanalytics/src/models/index.ts index a6c6e2ffaa4a..4d9236cbe1a2 100644 --- a/sdk/streamanalytics/arm-streamanalytics/src/models/index.ts +++ b/sdk/streamanalytics/arm-streamanalytics/src/models/index.ts @@ -27,13 +27,19 @@ export type OutputDataSourceUnion = | AzureSqlDatabaseOutputDataSource | AzureSynapseOutputDataSource | DocumentDbOutputDataSource + | AzureFunctionOutputDataSource | ServiceBusQueueOutputDataSource | ServiceBusTopicOutputDataSource | PowerBIOutputDataSource | AzureDataLakeStoreOutputDataSource; export type FunctionPropertiesUnion = | FunctionProperties - | ScalarFunctionProperties; + | ScalarFunctionProperties + | AggregateFunctionProperties; +export type FunctionBindingUnion = + | FunctionBinding + | AzureMachineLearningWebServiceFunctionBinding + | JavaScriptFunctionBinding; export type FunctionRetrieveDefaultDefinitionParametersUnion = | FunctionRetrieveDefaultDefinitionParameters | AzureMachineLearningWebServiceFunctionRetrieveDefaultDefinitionParameters @@ -48,10 +54,6 @@ export type ReferenceInputDataSourceUnion = | ReferenceInputDataSource | BlobReferenceInputDataSource | AzureSqlReferenceInputDataSource; -export type FunctionBindingUnion = - | FunctionBinding - | AzureMachineLearningWebServiceFunctionBinding - | JavaScriptFunctionBinding; /** Result of the request to list Stream Analytics operations. It contains a list of operations and a URL link to get the next set of results. */ export interface OperationListResult { @@ -230,6 +232,7 @@ export interface OutputDataSource { | "Microsoft.Sql/Server/Database" | "Microsoft.Sql/Server/DataWarehouse" | "Microsoft.Storage/DocumentDB" + | "Microsoft.AzureFunction" | "Microsoft.ServiceBus/Queue" | "Microsoft.ServiceBus/Topic" | "PowerBI" @@ -239,12 +242,39 @@ export interface OutputDataSource { /** The properties that are associated with a function. */ export interface FunctionProperties { /** Polymorphic discriminator, which specifies the different types this object can be */ - type: "Scalar"; + type: "Scalar" | "Aggregate"; /** * 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. * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly etag?: string; + inputs?: FunctionInput[]; + /** Describes the output of a function. */ + output?: FunctionOutput; + /** The physical binding of the function. For example, in the Azure Machine Learning web service’s case, this describes the endpoint. */ + binding?: FunctionBindingUnion; +} + +/** Describes one input parameter of a function. */ +export interface FunctionInput { + /** The (Azure Stream Analytics supported) data type of the function input parameter. A list of valid Azure Stream Analytics data types are described at https://msdn.microsoft.com/en-us/library/azure/dn835065.aspx */ + dataType?: string; + /** A flag indicating if the parameter is a configuration parameter. True if this input parameter is expected to be a constant. Default is false. */ + isConfigurationParameter?: boolean; +} + +/** Describes the output of a function. */ +export interface FunctionOutput { + /** The (Azure Stream Analytics supported) data type of the function output. A list of valid Azure Stream Analytics data types are described at https://msdn.microsoft.com/en-us/library/azure/dn835065.aspx */ + dataType?: string; +} + +/** The physical binding of the function. For example, in the Azure Machine Learning web service’s case, this describes the endpoint. */ +export interface FunctionBinding { + /** Polymorphic discriminator, which specifies the different types this object can be */ + type: + | "Microsoft.MachineLearning/WebService" + | "Microsoft.StreamAnalytics/JavascriptUdf"; } /** The properties that are associated with an Azure Storage account */ @@ -536,6 +566,8 @@ export interface BlobDataSourceProperties { dateFormat?: string; /** The time format. Wherever {time} appears in pathPattern, the value of this property is used as the time format instead. */ timeFormat?: string; + /** Authentication Mode. */ + authenticationMode?: AuthenticationMode; } /** The common properties that are associated with Service Bus data sources (Queues, Topics, Event Hubs, etc.). */ @@ -594,28 +626,6 @@ export interface OAuthBasedDataSourceProperties { tokenUserDisplayName?: string; } -/** Describes one input parameter of a function. */ -export interface FunctionInput { - /** The (Azure Stream Analytics supported) data type of the function input parameter. A list of valid Azure Stream Analytics data types are described at https://msdn.microsoft.com/en-us/library/azure/dn835065.aspx */ - dataType?: string; - /** A flag indicating if the parameter is a configuration parameter. True if this input parameter is expected to be a constant. Default is false. */ - isConfigurationParameter?: boolean; -} - -/** Describes the output of a function. */ -export interface FunctionOutput { - /** The (Azure Stream Analytics supported) data type of the function output. A list of valid Azure Stream Analytics data types are described at https://msdn.microsoft.com/en-us/library/azure/dn835065.aspx */ - dataType?: string; -} - -/** The physical binding of the function. For example, in the Azure Machine Learning web service’s case, this describes the endpoint. */ -export interface FunctionBinding { - /** Polymorphic discriminator, which specifies the different types this object can be */ - type: - | "Microsoft.MachineLearning/WebService" - | "Microsoft.StreamAnalytics/JavascriptUdf"; -} - /** The inputs for the Azure Machine Learning web service endpoint. */ export interface AzureMachineLearningWebServiceInputs { /** The name of the input. This is the name provided while authoring the endpoint. */ @@ -891,6 +901,22 @@ export type DocumentDbOutputDataSource = OutputDataSource & { documentId?: string; }; +/** Defines the metadata of AzureFunctionOutputDataSource */ +export type AzureFunctionOutputDataSource = OutputDataSource & { + /** Polymorphic discriminator, which specifies the different types this object can be */ + type: "Microsoft.AzureFunction"; + /** The name of your Azure Functions app. */ + functionAppName?: string; + /** The name of the function in your Azure Functions app. */ + functionName?: string; + /** If you want to use an Azure Function from another subscription, you can do so by providing the key to access your function. */ + apiKey?: string; + /** A property that lets you set the maximum size for each output batch that's sent to your Azure function. The input unit is in bytes. By default, this value is 262,144 bytes (256 KB). */ + maxBatchSize?: number; + /** A property that lets you specify the maximum number of events in each batch that's sent to Azure Functions. The default value is 100. */ + maxBatchCount?: number; +}; + /** Describes a Service Bus Queue output data source. */ export type ServiceBusQueueOutputDataSource = OutputDataSource & { /** Polymorphic discriminator, which specifies the different types this object can be */ @@ -981,12 +1007,36 @@ export type AzureDataLakeStoreOutputDataSource = OutputDataSource & { export type ScalarFunctionProperties = FunctionProperties & { /** Polymorphic discriminator, which specifies the different types this object can be */ type: "Scalar"; - /** A list of inputs describing the parameters of the function. */ - inputs?: FunctionInput[]; - /** The output of the function. */ - output?: FunctionOutput; - /** The physical binding of the function. For example, in the Azure Machine Learning web service’s case, this describes the endpoint. */ - binding?: FunctionBindingUnion; +}; + +/** The properties that are associated with an aggregate function. */ +export type AggregateFunctionProperties = FunctionProperties & { + /** Polymorphic discriminator, which specifies the different types this object can be */ + type: "Aggregate"; +}; + +/** The binding to an Azure Machine Learning web service. */ +export type AzureMachineLearningWebServiceFunctionBinding = FunctionBinding & { + /** Polymorphic discriminator, which specifies the different types this object can be */ + type: "Microsoft.MachineLearning/WebService"; + /** The Request-Response execute endpoint of the Azure Machine Learning web service. Find out more here: https://docs.microsoft.com/en-us/azure/machine-learning/machine-learning-consume-web-services#request-response-service-rrs */ + endpoint?: string; + /** The API key used to authenticate with Request-Response endpoint. */ + apiKey?: string; + /** The inputs for the Azure Machine Learning web service endpoint. */ + inputs?: AzureMachineLearningWebServiceInputs; + /** A list of outputs from the Azure Machine Learning web service endpoint execution. */ + outputs?: AzureMachineLearningWebServiceOutputColumn[]; + /** Number between 1 and 10000 describing maximum number of rows for every Azure ML RRS execute request. Default is 1000. */ + batchSize?: number; +}; + +/** The binding to a JavaScript function. */ +export type JavaScriptFunctionBinding = FunctionBinding & { + /** Polymorphic discriminator, which specifies the different types this object can be */ + type: "Microsoft.StreamAnalytics/JavascriptUdf"; + /** The JavaScript code containing a single function definition. For example: 'function (x, y) { return x + y; }' */ + script?: string; }; /** The properties that are associated with an Azure Storage account with MSI */ @@ -1040,7 +1090,9 @@ export type BlobStreamInputDataSource = StreamInputDataSource & { dateFormat?: string; /** The time format. Wherever {time} appears in pathPattern, the value of this property is used as the time format instead. */ timeFormat?: string; - /** The partition count of the blob input data source. Range 1 - 256. */ + /** Authentication Mode. */ + authenticationMode?: AuthenticationMode; + /** The partition count of the blob input data source. Range 1 - 1024. */ sourcePartitionCount?: number; }; @@ -1110,6 +1162,8 @@ export type BlobReferenceInputDataSource = ReferenceInputDataSource & { dateFormat?: string; /** The time format. Wherever {time} appears in pathPattern, the value of this property is used as the time format instead. */ timeFormat?: string; + /** Authentication Mode. */ + authenticationMode?: AuthenticationMode; }; /** Describes an Azure SQL database reference input data source. */ @@ -1138,7 +1192,7 @@ export type AzureSqlReferenceInputDataSource = ReferenceInputDataSource & { /** The properties that are associated with a blob input containing stream data. */ export type BlobStreamInputDataSourceProperties = BlobDataSourceProperties & { - /** The partition count of the blob input data source. Range 1 - 256. */ + /** The partition count of the blob input data source. Range 1 - 1024. */ sourcePartitionCount?: number; }; @@ -1146,10 +1200,7 @@ export type BlobStreamInputDataSourceProperties = BlobDataSourceProperties & { export type BlobReferenceInputDataSourceProperties = BlobDataSourceProperties & {}; /** The properties that are associated with a blob output. */ -export type BlobOutputDataSourceProperties = BlobDataSourceProperties & { - /** Authentication Mode. */ - authenticationMode?: AuthenticationMode; -}; +export type BlobOutputDataSourceProperties = BlobDataSourceProperties & {}; /** The common properties that are associated with Event Hub data sources. */ export type EventHubDataSourceProperties = ServiceBusDataSourceProperties & { @@ -1213,30 +1264,6 @@ export type AzureDataLakeStoreOutputDataSourceProperties = OAuthBasedDataSourceP authenticationMode?: AuthenticationMode; }; -/** The binding to an Azure Machine Learning web service. */ -export type AzureMachineLearningWebServiceFunctionBinding = FunctionBinding & { - /** Polymorphic discriminator, which specifies the different types this object can be */ - type: "Microsoft.MachineLearning/WebService"; - /** The Request-Response execute endpoint of the Azure Machine Learning web service. Find out more here: https://docs.microsoft.com/en-us/azure/machine-learning/machine-learning-consume-web-services#request-response-service-rrs */ - endpoint?: string; - /** The API key used to authenticate with Request-Response endpoint. */ - apiKey?: string; - /** The inputs for the Azure Machine Learning web service endpoint. */ - inputs?: AzureMachineLearningWebServiceInputs; - /** A list of outputs from the Azure Machine Learning web service endpoint execution. */ - outputs?: AzureMachineLearningWebServiceOutputColumn[]; - /** Number between 1 and 10000 describing maximum number of rows for every Azure ML RRS execute request. Default is 1000. */ - batchSize?: number; -}; - -/** The binding to a JavaScript function. */ -export type JavaScriptFunctionBinding = FunctionBinding & { - /** Polymorphic discriminator, which specifies the different types this object can be */ - type: "Microsoft.StreamAnalytics/JavascriptUdf"; - /** The JavaScript code containing a single function definition. For example: 'function (x, y) { return x + y; }' */ - script?: string; -}; - /** A streaming job object, containing all information associated with the named streaming job. */ export type StreamingJob = TrackedResource & { /** Describes the system-assigned managed identity assigned to this job that can be used to authenticate with inputs and outputs. */ diff --git a/sdk/streamanalytics/arm-streamanalytics/src/models/mappers.ts b/sdk/streamanalytics/arm-streamanalytics/src/models/mappers.ts index 854205becd9d..4821b42cec12 100644 --- a/sdk/streamanalytics/arm-streamanalytics/src/models/mappers.ts +++ b/sdk/streamanalytics/arm-streamanalytics/src/models/mappers.ts @@ -417,6 +417,89 @@ export const FunctionProperties: coreClient.CompositeMapper = { type: { name: "String" } + }, + inputs: { + serializedName: "properties.inputs", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "FunctionInput" + } + } + } + }, + output: { + serializedName: "properties.output", + type: { + name: "Composite", + className: "FunctionOutput" + } + }, + binding: { + serializedName: "properties.binding", + type: { + name: "Composite", + className: "FunctionBinding" + } + } + } + } +}; + +export const FunctionInput: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "FunctionInput", + modelProperties: { + dataType: { + serializedName: "dataType", + type: { + name: "String" + } + }, + isConfigurationParameter: { + serializedName: "isConfigurationParameter", + type: { + name: "Boolean" + } + } + } + } +}; + +export const FunctionOutput: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "FunctionOutput", + modelProperties: { + dataType: { + serializedName: "dataType", + type: { + name: "String" + } + } + } + } +}; + +export const FunctionBinding: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "FunctionBinding", + uberParent: "FunctionBinding", + polymorphicDiscriminator: { + serializedName: "type", + clientName: "type" + }, + modelProperties: { + type: { + serializedName: "type", + required: true, + type: { + name: "String" + } } } } @@ -1050,6 +1133,12 @@ export const BlobDataSourceProperties: coreClient.CompositeMapper = { type: { name: "String" } + }, + authenticationMode: { + serializedName: "authenticationMode", + type: { + name: "String" + } } } } @@ -1211,63 +1300,6 @@ export const OAuthBasedDataSourceProperties: coreClient.CompositeMapper = { } }; -export const FunctionInput: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "FunctionInput", - modelProperties: { - dataType: { - serializedName: "dataType", - type: { - name: "String" - } - }, - isConfigurationParameter: { - serializedName: "isConfigurationParameter", - type: { - name: "Boolean" - } - } - } - } -}; - -export const FunctionOutput: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "FunctionOutput", - modelProperties: { - dataType: { - serializedName: "dataType", - type: { - name: "String" - } - } - } - } -}; - -export const FunctionBinding: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "FunctionBinding", - uberParent: "FunctionBinding", - polymorphicDiscriminator: { - serializedName: "type", - clientName: "type" - }, - modelProperties: { - type: { - serializedName: "type", - required: true, - type: { - name: "String" - } - } - } - } -}; - export const AzureMachineLearningWebServiceInputs: coreClient.CompositeMapper = { type: { name: "Composite", @@ -2009,6 +2041,49 @@ export const DocumentDbOutputDataSource: coreClient.CompositeMapper = { } }; +export const AzureFunctionOutputDataSource: coreClient.CompositeMapper = { + serializedName: "Microsoft.AzureFunction", + type: { + name: "Composite", + className: "AzureFunctionOutputDataSource", + uberParent: "OutputDataSource", + polymorphicDiscriminator: OutputDataSource.type.polymorphicDiscriminator, + modelProperties: { + ...OutputDataSource.type.modelProperties, + functionAppName: { + serializedName: "properties.functionAppName", + type: { + name: "String" + } + }, + functionName: { + serializedName: "properties.functionName", + type: { + name: "String" + } + }, + apiKey: { + serializedName: "properties.apiKey", + type: { + name: "String" + } + }, + maxBatchSize: { + serializedName: "properties.maxBatchSize", + type: { + name: "Number" + } + }, + maxBatchCount: { + serializedName: "properties.maxBatchCount", + type: { + name: "Number" + } + } + } + } +}; + export const ServiceBusQueueOutputDataSource: coreClient.CompositeMapper = { serializedName: "Microsoft.ServiceBus/Queue", type: { @@ -2267,31 +2342,87 @@ export const ScalarFunctionProperties: coreClient.CompositeMapper = { uberParent: "FunctionProperties", polymorphicDiscriminator: FunctionProperties.type.polymorphicDiscriminator, modelProperties: { - ...FunctionProperties.type.modelProperties, + ...FunctionProperties.type.modelProperties + } + } +}; + +export const AggregateFunctionProperties: coreClient.CompositeMapper = { + serializedName: "Aggregate", + type: { + name: "Composite", + className: "AggregateFunctionProperties", + uberParent: "FunctionProperties", + polymorphicDiscriminator: FunctionProperties.type.polymorphicDiscriminator, + modelProperties: { + ...FunctionProperties.type.modelProperties + } + } +}; + +export const AzureMachineLearningWebServiceFunctionBinding: coreClient.CompositeMapper = { + serializedName: "Microsoft.MachineLearning/WebService", + type: { + name: "Composite", + className: "AzureMachineLearningWebServiceFunctionBinding", + uberParent: "FunctionBinding", + polymorphicDiscriminator: FunctionBinding.type.polymorphicDiscriminator, + modelProperties: { + ...FunctionBinding.type.modelProperties, + endpoint: { + serializedName: "properties.endpoint", + type: { + name: "String" + } + }, + apiKey: { + serializedName: "properties.apiKey", + type: { + name: "String" + } + }, inputs: { serializedName: "properties.inputs", + type: { + name: "Composite", + className: "AzureMachineLearningWebServiceInputs" + } + }, + outputs: { + serializedName: "properties.outputs", type: { name: "Sequence", element: { type: { name: "Composite", - className: "FunctionInput" + className: "AzureMachineLearningWebServiceOutputColumn" } } } }, - output: { - serializedName: "properties.output", + batchSize: { + serializedName: "properties.batchSize", type: { - name: "Composite", - className: "FunctionOutput" + name: "Number" } - }, - binding: { - serializedName: "properties.binding", + } + } + } +}; + +export const JavaScriptFunctionBinding: coreClient.CompositeMapper = { + serializedName: "Microsoft.StreamAnalytics/JavascriptUdf", + type: { + name: "Composite", + className: "JavaScriptFunctionBinding", + uberParent: "FunctionBinding", + polymorphicDiscriminator: FunctionBinding.type.polymorphicDiscriminator, + modelProperties: { + ...FunctionBinding.type.modelProperties, + script: { + serializedName: "properties.script", type: { - name: "Composite", - className: "FunctionBinding" + name: "String" } } } @@ -2450,6 +2581,12 @@ export const BlobStreamInputDataSource: coreClient.CompositeMapper = { name: "String" } }, + authenticationMode: { + serializedName: "properties.authenticationMode", + type: { + name: "String" + } + }, sourcePartitionCount: { serializedName: "properties.sourcePartitionCount", type: { @@ -2649,6 +2786,12 @@ export const BlobReferenceInputDataSource: coreClient.CompositeMapper = { type: { name: "String" } + }, + authenticationMode: { + serializedName: "properties.authenticationMode", + type: { + name: "String" + } } } } @@ -2753,13 +2896,7 @@ export const BlobOutputDataSourceProperties: coreClient.CompositeMapper = { name: "Composite", className: "BlobOutputDataSourceProperties", modelProperties: { - ...BlobDataSourceProperties.type.modelProperties, - authenticationMode: { - serializedName: "authenticationMode", - type: { - name: "String" - } - } + ...BlobDataSourceProperties.type.modelProperties } } }; @@ -2954,75 +3091,6 @@ export const AzureDataLakeStoreOutputDataSourceProperties: coreClient.CompositeM } }; -export const AzureMachineLearningWebServiceFunctionBinding: coreClient.CompositeMapper = { - serializedName: "Microsoft.MachineLearning/WebService", - type: { - name: "Composite", - className: "AzureMachineLearningWebServiceFunctionBinding", - uberParent: "FunctionBinding", - polymorphicDiscriminator: FunctionBinding.type.polymorphicDiscriminator, - modelProperties: { - ...FunctionBinding.type.modelProperties, - endpoint: { - serializedName: "properties.endpoint", - type: { - name: "String" - } - }, - apiKey: { - serializedName: "properties.apiKey", - type: { - name: "String" - } - }, - inputs: { - serializedName: "properties.inputs", - type: { - name: "Composite", - className: "AzureMachineLearningWebServiceInputs" - } - }, - outputs: { - serializedName: "properties.outputs", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "AzureMachineLearningWebServiceOutputColumn" - } - } - } - }, - batchSize: { - serializedName: "properties.batchSize", - type: { - name: "Number" - } - } - } - } -}; - -export const JavaScriptFunctionBinding: coreClient.CompositeMapper = { - serializedName: "Microsoft.StreamAnalytics/JavascriptUdf", - type: { - name: "Composite", - className: "JavaScriptFunctionBinding", - uberParent: "FunctionBinding", - polymorphicDiscriminator: FunctionBinding.type.polymorphicDiscriminator, - modelProperties: { - ...FunctionBinding.type.modelProperties, - script: { - serializedName: "properties.script", - type: { - name: "String" - } - } - } - } -}; - export const StreamingJob: coreClient.CompositeMapper = { type: { name: "Composite", @@ -3574,10 +3642,10 @@ export let discriminators = { Serialization: Serialization, OutputDataSource: OutputDataSource, FunctionProperties: FunctionProperties, + FunctionBinding: FunctionBinding, FunctionRetrieveDefaultDefinitionParameters: FunctionRetrieveDefaultDefinitionParameters, StreamInputDataSource: StreamInputDataSource, ReferenceInputDataSource: ReferenceInputDataSource, - FunctionBinding: FunctionBinding, "InputProperties.Stream": StreamInputProperties, "InputProperties.Reference": ReferenceInputProperties, "Serialization.Parquet": ParquetSerialization, @@ -3591,11 +3659,15 @@ export let discriminators = { "OutputDataSource.Microsoft.Sql/Server/Database": AzureSqlDatabaseOutputDataSource, "OutputDataSource.Microsoft.Sql/Server/DataWarehouse": AzureSynapseOutputDataSource, "OutputDataSource.Microsoft.Storage/DocumentDB": DocumentDbOutputDataSource, + "OutputDataSource.Microsoft.AzureFunction": AzureFunctionOutputDataSource, "OutputDataSource.Microsoft.ServiceBus/Queue": ServiceBusQueueOutputDataSource, "OutputDataSource.Microsoft.ServiceBus/Topic": ServiceBusTopicOutputDataSource, "OutputDataSource.PowerBI": PowerBIOutputDataSource, "OutputDataSource.Microsoft.DataLake/Accounts": AzureDataLakeStoreOutputDataSource, "FunctionProperties.Scalar": ScalarFunctionProperties, + "FunctionProperties.Aggregate": AggregateFunctionProperties, + "FunctionBinding.Microsoft.MachineLearning/WebService": AzureMachineLearningWebServiceFunctionBinding, + "FunctionBinding.Microsoft.StreamAnalytics/JavascriptUdf": JavaScriptFunctionBinding, "FunctionRetrieveDefaultDefinitionParameters.Microsoft.MachineLearning/WebService": AzureMachineLearningWebServiceFunctionRetrieveDefaultDefinitionParameters, "FunctionRetrieveDefaultDefinitionParameters.Microsoft.StreamAnalytics/JavascriptUdf": JavaScriptFunctionRetrieveDefaultDefinitionParameters, "StreamInputDataSource.Microsoft.Storage/Blob": BlobStreamInputDataSource, @@ -3603,7 +3675,5 @@ export let discriminators = { "StreamInputDataSource.Microsoft.EventHub/EventHub": EventHubV2StreamInputDataSource, "StreamInputDataSource.Microsoft.Devices/IotHubs": IoTHubStreamInputDataSource, "ReferenceInputDataSource.Microsoft.Storage/Blob": BlobReferenceInputDataSource, - "ReferenceInputDataSource.Microsoft.Sql/Server/Database": AzureSqlReferenceInputDataSource, - "FunctionBinding.Microsoft.MachineLearning/WebService": AzureMachineLearningWebServiceFunctionBinding, - "FunctionBinding.Microsoft.StreamAnalytics/JavascriptUdf": JavaScriptFunctionBinding + "ReferenceInputDataSource.Microsoft.Sql/Server/Database": AzureSqlReferenceInputDataSource }; diff --git a/sdk/streamanalytics/arm-streamanalytics/src/streamAnalyticsManagementClient.ts b/sdk/streamanalytics/arm-streamanalytics/src/streamAnalyticsManagementClient.ts index 83921827c07e..cbb15f314d33 100644 --- a/sdk/streamanalytics/arm-streamanalytics/src/streamAnalyticsManagementClient.ts +++ b/sdk/streamanalytics/arm-streamanalytics/src/streamAnalyticsManagementClient.ts @@ -64,7 +64,7 @@ export class StreamAnalyticsManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-streamanalytics/4.0.0`; + const packageDetails = `azsdk-js-arm-streamanalytics/4.1.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` diff --git a/sdk/streamanalytics/arm-streamanalytics/tsconfig.json b/sdk/streamanalytics/arm-streamanalytics/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/streamanalytics/arm-streamanalytics/tsconfig.json +++ b/sdk/streamanalytics/arm-streamanalytics/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file diff --git a/sdk/streamanalytics/ci.mgmt.yml b/sdk/streamanalytics/ci.mgmt.yml index fff154729ffd..466ff0f19456 100644 --- a/sdk/streamanalytics/ci.mgmt.yml +++ b/sdk/streamanalytics/ci.mgmt.yml @@ -1,5 +1,5 @@ # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. - + trigger: branches: include: @@ -10,6 +10,7 @@ trigger: include: - sdk/streamanalytics/ci.mgmt.yml - sdk/streamanalytics/arm-streamanalytics/ + - sdk/streamanalytics/arm-streamanalytics pr: branches: include: @@ -23,11 +24,11 @@ pr: include: - sdk/streamanalytics/ci.mgmt.yml - sdk/streamanalytics/arm-streamanalytics/ - + - sdk/streamanalytics/arm-streamanalytics extends: template: /eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: streamanalytics Artifacts: - name: azure-arm-streamanalytics - safeName: azurearmstreamanalytics \ No newline at end of file + safeName: azurearmstreamanalytics