From 3ac835f63d238f3d6d1a3b38b5e20f60f9d9e74a Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sat, 1 Aug 2020 01:45:14 +0000 Subject: [PATCH 1/2] Update from master --- .../src/models/dataFlowDebugSessionMappers.ts | 1 + .../src/models/dataFlowsMappers.ts | 2 + .../src/models/datasetsMappers.ts | 2 + .../src/models/factoriesMappers.ts | 2 + .../arm-datafactory/src/models/index.ts | 242 ++++++++++++++++-- .../src/models/integrationRuntimesMappers.ts | 2 + .../src/models/linkedServicesMappers.ts | 2 + .../arm-datafactory/src/models/mappers.ts | 235 +++++++++++++++-- .../src/models/pipelinesMappers.ts | 2 + .../src/models/triggersMappers.ts | 2 + .../src/operations/dataFlowDebugSession.ts | 6 +- .../src/operations/triggerRuns.ts | 65 +++++ 12 files changed, 524 insertions(+), 39 deletions(-) diff --git a/sdk/datafactory/arm-datafactory/src/models/dataFlowDebugSessionMappers.ts b/sdk/datafactory/arm-datafactory/src/models/dataFlowDebugSessionMappers.ts index b9ccb6592dde..673d3f805439 100644 --- a/sdk/datafactory/arm-datafactory/src/models/dataFlowDebugSessionMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/dataFlowDebugSessionMappers.ts @@ -18,6 +18,7 @@ export { AmazonS3Location, AvroDataset, AvroFormat, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, diff --git a/sdk/datafactory/arm-datafactory/src/models/dataFlowsMappers.ts b/sdk/datafactory/arm-datafactory/src/models/dataFlowsMappers.ts index c3dfbe1cfa58..aaf4209b8290 100644 --- a/sdk/datafactory/arm-datafactory/src/models/dataFlowsMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/dataFlowsMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -391,6 +392,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts b/sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts index dd56da18e57b..b9c72f588a1c 100644 --- a/sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -391,6 +392,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/factoriesMappers.ts b/sdk/datafactory/arm-datafactory/src/models/factoriesMappers.ts index 2b005e64716a..35e3a60b6892 100644 --- a/sdk/datafactory/arm-datafactory/src/models/factoriesMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/factoriesMappers.ts @@ -29,6 +29,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -396,6 +397,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/index.ts b/sdk/datafactory/arm-datafactory/src/models/index.ts index 6da41a2fbc6a..e779c2fe15b7 100644 --- a/sdk/datafactory/arm-datafactory/src/models/index.ts +++ b/sdk/datafactory/arm-datafactory/src/models/index.ts @@ -1712,9 +1712,9 @@ export interface DataFlowStagingInfo { */ linkedService?: LinkedServiceReference; /** - * Folder path for staging blob. + * Folder path for staging blob. Type: string (or Expression with resultType string) */ - folderPath?: string; + folderPath?: any; } /** @@ -1962,6 +1962,10 @@ export interface DataFlowSink extends Transformation { * Schema linked service reference. */ schemaLinkedService?: LinkedServiceReference; + /** + * Staging info for execute data flow activity. + */ + staging?: DataFlowStagingInfo; } /** @@ -1980,6 +1984,10 @@ export interface DataFlowSource extends Transformation { * Schema linked service reference. */ schemaLinkedService?: LinkedServiceReference; + /** + * Staging info for execute data flow activity. + */ + staging?: DataFlowStagingInfo; } /** @@ -2642,6 +2650,11 @@ export interface AzureDatabricksLinkedService { * configurations. */ newClusterCustomTags?: { [propertyName: string]: any }; + /** + * Specify a location to deliver Spark driver, worker, and event logs. Type: string (or + * Expression with resultType string). + */ + newClusterLogDestination?: any; /** * The driver node type for the new job cluster. This property is ignored in instance pool * configurations. Type: string (or Expression with resultType string). @@ -2952,11 +2965,16 @@ export interface SalesforceMarketingCloudLinkedService { * List of tags that can be used for describing the linked service. */ annotations?: any[]; + /** + * Properties used to connect to Salesforce Marketing Cloud. It is mutually exclusive with any + * other properties in the linked service. Type: object. + */ + connectionProperties?: any; /** * The client ID associated with the Salesforce Marketing Cloud application. Type: string (or * Expression with resultType string). */ - clientId: any; + clientId?: any; /** * The client secret associated with the Salesforce Marketing Cloud application. Type: string (or * Expression with resultType string). @@ -3087,10 +3105,15 @@ export interface ZohoLinkedService { * List of tags that can be used for describing the linked service. */ annotations?: any[]; + /** + * Properties used to connect to Zoho. It is mutually exclusive with any other properties in the + * linked service. Type: object. + */ + connectionProperties?: any; /** * The endpoint of the Zoho server. (i.e. crm.zoho.com/crm/private) */ - endpoint: any; + endpoint?: any; /** * The access token for Zoho authentication. */ @@ -3141,10 +3164,15 @@ export interface XeroLinkedService { * List of tags that can be used for describing the linked service. */ annotations?: any[]; + /** + * Properties used to connect to Xero. It is mutually exclusive with any other properties in the + * linked service. Type: object. + */ + connectionProperties?: any; /** * The endpoint of the Xero server. (i.e. api.xero.com) */ - host: any; + host?: any; /** * The consumer key associated with the Xero application. */ @@ -3201,14 +3229,19 @@ export interface SquareLinkedService { * List of tags that can be used for describing the linked service. */ annotations?: any[]; + /** + * Properties used to connect to Square. It is mutually exclusive with any other properties in + * the linked service. Type: object. + */ + connectionProperties?: any; /** * The URL of the Square instance. (i.e. mystore.mysquare.com) */ - host: any; + host?: any; /** * The client ID associated with your Square application. */ - clientId: any; + clientId?: any; /** * The client secret associated with your Square application. */ @@ -3216,7 +3249,7 @@ export interface SquareLinkedService { /** * The redirect URL assigned in the Square application dashboard. (i.e. http://localhost:2500) */ - redirectUri: any; + redirectUri?: any; /** * Specifies whether the data source endpoints are encrypted using HTTPS. The default value is * true. @@ -3480,30 +3513,35 @@ export interface QuickBooksLinkedService { * List of tags that can be used for describing the linked service. */ annotations?: any[]; + /** + * Properties used to connect to QuickBooks. It is mutually exclusive with any other properties + * in the linked service. Type: object. + */ + connectionProperties?: any; /** * The endpoint of the QuickBooks server. (i.e. quickbooks.api.intuit.com) */ - endpoint: any; + endpoint?: any; /** * The company ID of the QuickBooks company to authorize. */ - companyId: any; + companyId?: any; /** * The consumer key for OAuth 1.0 authentication. */ - consumerKey: any; + consumerKey?: any; /** * The consumer secret for OAuth 1.0 authentication. */ - consumerSecret: SecretBaseUnion; + consumerSecret?: SecretBaseUnion; /** * The access token for OAuth 1.0 authentication. */ - accessToken: SecretBaseUnion; + accessToken?: SecretBaseUnion; /** * The access token secret for OAuth 1.0 authentication. */ - accessTokenSecret: SecretBaseUnion; + accessTokenSecret?: SecretBaseUnion; /** * Specifies whether the data source endpoints are encrypted using HTTPS. The default value is * true. @@ -5305,6 +5343,12 @@ export interface RestServiceLinkedService { * type under which your application resides. */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The resource you are requesting authorization to use. */ @@ -5344,23 +5388,28 @@ export interface SapOpenHubLinkedService { * Host name of the SAP BW instance where the open hub destination is located. Type: string (or * Expression with resultType string). */ - server: any; + server?: any; /** * System number of the BW system where the open hub destination is located. (Usually a two-digit * decimal number represented as a string.) Type: string (or Expression with resultType string). */ - systemNumber: any; + systemNumber?: any; /** * Client ID of the client on the BW system where the open hub destination is located. (Usually a * three-digit decimal number represented as a string) Type: string (or Expression with * resultType string). */ - clientId: any; + clientId?: any; /** * Language of the BW system where the open hub destination is located. The default value is EN. * Type: string (or Expression with resultType string). */ language?: any; + /** + * SystemID of the SAP system where the table is located. Type: string (or Expression with + * resultType string). + */ + systemId?: any; /** * Username to access the SAP BW server where the open hub destination is located. Type: string * (or Expression with resultType string). @@ -5370,6 +5419,19 @@ export interface SapOpenHubLinkedService { * Password to access the SAP BW server where the open hub destination is located. */ password?: SecretBaseUnion; + /** + * The hostname of the SAP Message Server. Type: string (or Expression with resultType string). + */ + messageServer?: any; + /** + * The service name or port number of the Message Server. Type: string (or Expression with + * resultType string). + */ + messageServerService?: any; + /** + * The Logon Group for the SAP System. Type: string (or Expression with resultType string). + */ + logonGroup?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -5682,6 +5744,12 @@ export interface AzureBlobFSLinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -5731,6 +5799,12 @@ export interface AzureDataLakeStoreLinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * Data Lake Store account name. Type: string (or Expression with resultType string). */ @@ -6115,6 +6189,12 @@ export interface ODataLinkedService { * string (or Expression with resultType string). */ servicePrincipalId?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * Specify the resource you are requesting authorization to use Directory. Type: string (or * Expression with resultType string). @@ -6918,6 +6998,10 @@ export interface AzureFileStorageLinkedService { * Expression with resultType string). */ fileShare?: any; + /** + * The azure file share snapshot version. Type: string (or Expression with resultType string). + */ + snapshot?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -7483,6 +7567,12 @@ export interface AzureSqlMILinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -7536,6 +7626,12 @@ export interface AzureSqlDatabaseLinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -7634,6 +7730,12 @@ export interface AzureSqlDWLinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -7751,6 +7853,12 @@ export interface AzureBlobStorageLinkedService { * Expression with resultType string). */ tenant?: any; + /** + * Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, + * AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud + * type. Type: string (or Expression with resultType string). + */ + azureCloudType?: any; /** * The encrypted credential used for authentication. Credentials are encrypted using the * integration runtime credential manager. Type: string (or Expression with resultType string). @@ -17937,6 +18045,11 @@ export interface SapTableSource { * string (or Expression with resultType string). */ customRfcReadTableFunctionModule?: any; + /** + * The single character that will be used as delimiter passed to SAP RFC as well as splitting the + * output data retrieved. Type: string (or Expression with resultType string). + */ + sapDataColumnDelimiter?: any; /** * The partition mechanism that will be used for SAP table read in parallel. Possible values * include: 'None', 'PartitionOnInt', 'PartitionOnCalendarYear', 'PartitionOnCalendarMonth', @@ -17992,6 +18105,16 @@ export interface SapOpenHubSource { * with resultType integer ). */ baseRequestId?: any; + /** + * Specifies the custom RFC function module that will be used to read data from SAP Table. Type: + * string (or Expression with resultType string). + */ + customRfcReadTableFunctionModule?: any; + /** + * The single character that will be used as delimiter passed to SAP RFC as well as splitting the + * output data retrieved. Type: string (or Expression with resultType string). + */ + sapDataColumnDelimiter?: any; } /** @@ -19706,7 +19829,7 @@ export interface StagingSettings { /** * Contains the possible cases for CopySink. */ -export type CopySinkUnion = CopySink | CosmosDbMongoDbApiSink | SalesforceServiceCloudSink | SalesforceSink | AzureDataExplorerSink | CommonDataServiceForAppsSink | DynamicsCrmSink | DynamicsSink | MicrosoftAccessSink | InformixSink | OdbcSink | AzureSearchIndexSink | AzureBlobFSSink | AzureDataLakeStoreSink | OracleSink | SnowflakeSink | SqlDWSink | SqlMISink | AzureSqlSink | SqlServerSink | SqlSink | CosmosDbSqlApiSink | DocumentDbCollectionSink | FileSystemSink | BlobSink | BinarySink | ParquetSink | AvroSink | AzureTableSink | AzureQueueSink | SapCloudForCustomerSink | AzureMySqlSink | AzurePostgreSqlSink | OrcSink | JsonSink | DelimitedTextSink; +export type CopySinkUnion = CopySink | CosmosDbMongoDbApiSink | SalesforceServiceCloudSink | SalesforceSink | AzureDataExplorerSink | CommonDataServiceForAppsSink | DynamicsCrmSink | DynamicsSink | MicrosoftAccessSink | InformixSink | OdbcSink | AzureSearchIndexSink | AzureBlobFSSink | AzureDataLakeStoreSink | OracleSink | SnowflakeSink | SqlDWSink | SqlMISink | AzureSqlSink | SqlServerSink | SqlSink | CosmosDbSqlApiSink | DocumentDbCollectionSink | FileSystemSink | BlobSink | BinarySink | ParquetSink | AvroSink | AzureTableSink | AzureQueueSink | SapCloudForCustomerSink | AzureMySqlSink | AzurePostgreSqlSink | RestSink | OrcSink | JsonSink | DelimitedTextSink; /** * A copy activity sink. @@ -21477,6 +21600,69 @@ export interface AzurePostgreSqlSink { preCopyScript?: any; } +/** + * A copy activity Rest service Sink. + */ +export interface RestSink { + /** + * Polymorphic Discriminator + */ + type: "RestSink"; + /** + * Write batch size. Type: integer (or Expression with resultType integer), minimum: 0. + */ + writeBatchSize?: any; + /** + * Write batch timeout. Type: string (or Expression with resultType string), pattern: + * ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + */ + writeBatchTimeout?: any; + /** + * Sink retry count. Type: integer (or Expression with resultType integer). + */ + sinkRetryCount?: any; + /** + * Sink retry wait. Type: string (or Expression with resultType string), pattern: + * ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + */ + sinkRetryWait?: any; + /** + * The maximum concurrent connection count for the sink data store. Type: integer (or Expression + * with resultType integer). + */ + maxConcurrentConnections?: any; + /** + * The HTTP method used to call the RESTful API. The default is POST. Type: string (or Expression + * with resultType string). + */ + requestMethod?: any; + /** + * The additional HTTP headers in the request to the RESTful API. Type: string (or Expression + * with resultType string). + */ + additionalHeaders?: any; + /** + * The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the + * timeout to read response data. Default value: 00:01:40. Type: string (or Expression with + * resultType string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + */ + httpRequestTimeout?: any; + /** + * The time to await before sending next request, in milliseconds + */ + requestInterval?: any; + /** + * Compression Type to Send data in compressed format with Optimal Compression Level, Default is + * None. And The Only Supported option is Gzip. + */ + compressionType?: any; + /** + * Wraps Request Array Json into an Object before calling the rest endpoint , Default is false. + * ex: if true request content sample format is { rows:[]} else the format is [] + */ + wrapRequestJsonInAnObject?: any; +} + /** * A copy activity ORC sink. */ @@ -21781,8 +21967,8 @@ export interface WebHookActivity { */ authentication?: WebActivityAuthentication; /** - * When set to true, statusCode, output and error in callback request body will be consumed by - * activity. The activity can be marked as failed by setting statusCode >= 400 in callback + * When set to true, statusCode, output and error in callback request body will be consumed by + * activity. The activity can be marked as failed by setting statusCode >= 400 in callback * request. Default is false. Type: boolean (or Expression with resultType boolean). */ reportStatusOnCallBack?: any; @@ -22661,7 +22847,7 @@ export interface PackageStore { /** * Contains the possible cases for CustomSetupBase. */ -export type CustomSetupBaseUnion = CustomSetupBase | ComponentSetup | EnvironmentVariableSetup | CmdkeySetup; +export type CustomSetupBaseUnion = CustomSetupBase | AzPowerShellSetup | ComponentSetup | EnvironmentVariableSetup | CmdkeySetup; /** * The base definition of the custom setup. @@ -22673,6 +22859,20 @@ export interface CustomSetupBase { type: "CustomSetupBase"; } +/** + * The express custom setup of installing Azure PowerShell. + */ +export interface AzPowerShellSetup { + /** + * Polymorphic Discriminator + */ + type: "AzPowerShellSetup"; + /** + * The required version of Azure PowerShell to install. + */ + version: string; +} + /** * The custom setup of installing 3rd party components. */ diff --git a/sdk/datafactory/arm-datafactory/src/models/integrationRuntimesMappers.ts b/sdk/datafactory/arm-datafactory/src/models/integrationRuntimesMappers.ts index 4a71bed7230b..1912ff890e36 100644 --- a/sdk/datafactory/arm-datafactory/src/models/integrationRuntimesMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/integrationRuntimesMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -405,6 +406,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/linkedServicesMappers.ts b/sdk/datafactory/arm-datafactory/src/models/linkedServicesMappers.ts index 9faa4f0c6bb8..4163a05e54ee 100644 --- a/sdk/datafactory/arm-datafactory/src/models/linkedServicesMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/linkedServicesMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -391,6 +392,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/mappers.ts b/sdk/datafactory/arm-datafactory/src/models/mappers.ts index 6c1af241b22c..56b5b623ab64 100644 --- a/sdk/datafactory/arm-datafactory/src/models/mappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/mappers.ts @@ -2891,7 +2891,7 @@ export const DataFlowStagingInfo: msRest.CompositeMapper = { folderPath: { serializedName: "folderPath", type: { - name: "String" + name: "Object" } } } @@ -3327,6 +3327,13 @@ export const DataFlowSink: msRest.CompositeMapper = { name: "Composite", className: "LinkedServiceReference" } + }, + staging: { + serializedName: "staging", + type: { + name: "Composite", + className: "DataFlowStagingInfo" + } } } } @@ -3359,6 +3366,13 @@ export const DataFlowSource: msRest.CompositeMapper = { name: "Composite", className: "LinkedServiceReference" } + }, + staging: { + serializedName: "staging", + type: { + name: "Composite", + className: "DataFlowStagingInfo" + } } } } @@ -4045,6 +4059,12 @@ export const AzureDatabricksLinkedService: msRest.CompositeMapper = { } } }, + newClusterLogDestination: { + serializedName: "typeProperties.newClusterLogDestination", + type: { + name: "Object" + } + }, newClusterDriverNodeType: { serializedName: "typeProperties.newClusterDriverNodeType", type: { @@ -4422,8 +4442,13 @@ export const SalesforceMarketingCloudLinkedService: msRest.CompositeMapper = { className: "SalesforceMarketingCloudLinkedService", modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Object" + } + }, clientId: { - required: true, serializedName: "typeProperties.clientId", type: { name: "Object" @@ -4540,8 +4565,13 @@ export const ZohoLinkedService: msRest.CompositeMapper = { className: "ZohoLinkedService", modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Object" + } + }, endpoint: { - required: true, serializedName: "typeProperties.endpoint", type: { name: "Object" @@ -4592,8 +4622,13 @@ export const XeroLinkedService: msRest.CompositeMapper = { className: "XeroLinkedService", modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Object" + } + }, host: { - required: true, serializedName: "typeProperties.host", type: { name: "Object" @@ -4651,15 +4686,19 @@ export const SquareLinkedService: msRest.CompositeMapper = { className: "SquareLinkedService", modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Object" + } + }, host: { - required: true, serializedName: "typeProperties.host", type: { name: "Object" } }, clientId: { - required: true, serializedName: "typeProperties.clientId", type: { name: "Object" @@ -4673,7 +4712,6 @@ export const SquareLinkedService: msRest.CompositeMapper = { } }, redirectUri: { - required: true, serializedName: "typeProperties.redirectUri", type: { name: "Object" @@ -4949,29 +4987,31 @@ export const QuickBooksLinkedService: msRest.CompositeMapper = { className: "QuickBooksLinkedService", modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Object" + } + }, endpoint: { - required: true, serializedName: "typeProperties.endpoint", type: { name: "Object" } }, companyId: { - required: true, serializedName: "typeProperties.companyId", type: { name: "Object" } }, consumerKey: { - required: true, serializedName: "typeProperties.consumerKey", type: { name: "Object" } }, consumerSecret: { - required: true, serializedName: "typeProperties.consumerSecret", type: { name: "Composite", @@ -4979,7 +5019,6 @@ export const QuickBooksLinkedService: msRest.CompositeMapper = { } }, accessToken: { - required: true, serializedName: "typeProperties.accessToken", type: { name: "Composite", @@ -4987,7 +5026,6 @@ export const QuickBooksLinkedService: msRest.CompositeMapper = { } }, accessTokenSecret: { - required: true, serializedName: "typeProperties.accessTokenSecret", type: { name: "Composite", @@ -6800,6 +6838,12 @@ export const RestServiceLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, aadResourceId: { serializedName: "typeProperties.aadResourceId", type: { @@ -6827,21 +6871,18 @@ export const SapOpenHubLinkedService: msRest.CompositeMapper = { modelProperties: { ...LinkedService.type.modelProperties, server: { - required: true, serializedName: "typeProperties.server", type: { name: "Object" } }, systemNumber: { - required: true, serializedName: "typeProperties.systemNumber", type: { name: "Object" } }, clientId: { - required: true, serializedName: "typeProperties.clientId", type: { name: "Object" @@ -6853,6 +6894,12 @@ export const SapOpenHubLinkedService: msRest.CompositeMapper = { name: "Object" } }, + systemId: { + serializedName: "typeProperties.systemId", + type: { + name: "Object" + } + }, userName: { serializedName: "typeProperties.userName", type: { @@ -6866,6 +6913,24 @@ export const SapOpenHubLinkedService: msRest.CompositeMapper = { className: "SecretBase" } }, + messageServer: { + serializedName: "typeProperties.messageServer", + type: { + name: "Object" + } + }, + messageServerService: { + serializedName: "typeProperties.messageServerService", + type: { + name: "Object" + } + }, + logonGroup: { + serializedName: "typeProperties.logonGroup", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -7157,6 +7222,12 @@ export const AzureBlobFSLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -7203,6 +7274,12 @@ export const AzureDataLakeStoreLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, accountName: { serializedName: "typeProperties.accountName", type: { @@ -7585,6 +7662,12 @@ export const ODataLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, aadResourceId: { serializedName: "typeProperties.aadResourceId", type: { @@ -8368,6 +8451,12 @@ export const AzureFileStorageLinkedService: msRest.CompositeMapper = { name: "Object" } }, + snapshot: { + serializedName: "typeProperties.snapshot", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -8920,6 +9009,12 @@ export const AzureSqlMILinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -8973,6 +9068,12 @@ export const AzureSqlDatabaseLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -9066,6 +9167,12 @@ export const AzureSqlDWLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -9183,6 +9290,12 @@ export const AzureBlobStorageLinkedService: msRest.CompositeMapper = { name: "Object" } }, + azureCloudType: { + serializedName: "typeProperties.azureCloudType", + type: { + name: "Object" + } + }, encryptedCredential: { serializedName: "typeProperties.encryptedCredential", type: { @@ -17253,6 +17366,12 @@ export const SapTableSource: msRest.CompositeMapper = { name: "Object" } }, + sapDataColumnDelimiter: { + serializedName: "sapDataColumnDelimiter", + type: { + name: "Object" + } + }, partitionOption: { serializedName: "partitionOption", type: { @@ -17291,6 +17410,18 @@ export const SapOpenHubSource: msRest.CompositeMapper = { type: { name: "Object" } + }, + customRfcReadTableFunctionModule: { + serializedName: "customRfcReadTableFunctionModule", + type: { + name: "Object" + } + }, + sapDataColumnDelimiter: { + serializedName: "sapDataColumnDelimiter", + type: { + name: "Object" + } } }, additionalProperties: CopySource.type.additionalProperties @@ -20551,6 +20682,56 @@ export const AzurePostgreSqlSink: msRest.CompositeMapper = { } }; +export const RestSink: msRest.CompositeMapper = { + serializedName: "RestSink", + type: { + name: "Composite", + polymorphicDiscriminator: CopySink.type.polymorphicDiscriminator, + uberParent: "CopySink", + className: "RestSink", + modelProperties: { + ...CopySink.type.modelProperties, + requestMethod: { + serializedName: "requestMethod", + type: { + name: "Object" + } + }, + additionalHeaders: { + serializedName: "additionalHeaders", + type: { + name: "Object" + } + }, + httpRequestTimeout: { + serializedName: "httpRequestTimeout", + type: { + name: "Object" + } + }, + requestInterval: { + serializedName: "requestInterval", + type: { + name: "Object" + } + }, + compressionType: { + serializedName: "compressionType", + type: { + name: "Object" + } + }, + wrapRequestJsonInAnObject: { + serializedName: "wrapRequestJsonInAnObject", + type: { + name: "Object" + } + } + }, + additionalProperties: CopySink.type.additionalProperties + } +}; + export const OrcSink: msRest.CompositeMapper = { serializedName: "OrcSink", type: { @@ -22043,6 +22224,26 @@ export const CustomSetupBase: msRest.CompositeMapper = { } }; +export const AzPowerShellSetup: msRest.CompositeMapper = { + serializedName: "AzPowerShellSetup", + type: { + name: "Composite", + polymorphicDiscriminator: CustomSetupBase.type.polymorphicDiscriminator, + uberParent: "CustomSetupBase", + className: "AzPowerShellSetup", + modelProperties: { + ...CustomSetupBase.type.modelProperties, + version: { + required: true, + serializedName: "typeProperties.version", + type: { + name: "String" + } + } + } + } +}; + export const ComponentSetup: msRest.CompositeMapper = { serializedName: "ComponentSetup", type: { @@ -23807,6 +24008,7 @@ export const discriminators = { 'CopySink.SapCloudForCustomerSink' : SapCloudForCustomerSink, 'CopySink.AzureMySqlSink' : AzureMySqlSink, 'CopySink.AzurePostgreSqlSink' : AzurePostgreSqlSink, + 'CopySink.RestSink' : RestSink, 'CopySink.OrcSink' : OrcSink, 'CopySink.JsonSink' : JsonSink, 'CopySink.DelimitedTextSink' : DelimitedTextSink, @@ -23831,6 +24033,7 @@ export const discriminators = { 'LinkedIntegrationRuntimeType.Key' : LinkedIntegrationRuntimeKeyAuthorization, 'LinkedIntegrationRuntimeType' : LinkedIntegrationRuntimeType, 'IntegrationRuntime.SelfHosted' : SelfHostedIntegrationRuntime, + 'CustomSetupBase.AzPowerShellSetup' : AzPowerShellSetup, 'CustomSetupBase.ComponentSetup' : ComponentSetup, 'CustomSetupBase.EnvironmentVariableSetup' : EnvironmentVariableSetup, 'CustomSetupBase.CmdkeySetup' : CmdkeySetup, diff --git a/sdk/datafactory/arm-datafactory/src/models/pipelinesMappers.ts b/sdk/datafactory/arm-datafactory/src/models/pipelinesMappers.ts index 6ab92c2339e4..2bad08fa503d 100644 --- a/sdk/datafactory/arm-datafactory/src/models/pipelinesMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/pipelinesMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -392,6 +393,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/models/triggersMappers.ts b/sdk/datafactory/arm-datafactory/src/models/triggersMappers.ts index a0bfa10e86a1..0cd8a8827374 100644 --- a/sdk/datafactory/arm-datafactory/src/models/triggersMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/triggersMappers.ts @@ -28,6 +28,7 @@ export { AvroSink, AvroSource, AvroWriteSettings, + AzPowerShellSetup, AzureBatchLinkedService, AzureBlobDataset, AzureBlobFSDataset, @@ -390,6 +391,7 @@ export { ResponsysSource, RestResourceDataset, RestServiceLinkedService, + RestSink, RestSource, RetryPolicy, SalesforceLinkedService, diff --git a/sdk/datafactory/arm-datafactory/src/operations/dataFlowDebugSession.ts b/sdk/datafactory/arm-datafactory/src/operations/dataFlowDebugSession.ts index 9e69b78647cb..7a332a825ec7 100644 --- a/sdk/datafactory/arm-datafactory/src/operations/dataFlowDebugSession.ts +++ b/sdk/datafactory/arm-datafactory/src/operations/dataFlowDebugSession.ts @@ -345,7 +345,8 @@ const beginCreateOperationSpec: msRest.OperationSpec = { headersMapper: Mappers.DataFlowDebugSessionCreateHeaders }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.CloudError, + headersMapper: Mappers.DataFlowDebugSessionCreateHeaders } }, serializer @@ -381,7 +382,8 @@ const beginExecuteCommandOperationSpec: msRest.OperationSpec = { headersMapper: Mappers.DataFlowDebugSessionExecuteCommandHeaders }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.CloudError, + headersMapper: Mappers.DataFlowDebugSessionExecuteCommandHeaders } }, serializer diff --git a/sdk/datafactory/arm-datafactory/src/operations/triggerRuns.ts b/sdk/datafactory/arm-datafactory/src/operations/triggerRuns.ts index 2cad651c42b6..2dda221d5541 100644 --- a/sdk/datafactory/arm-datafactory/src/operations/triggerRuns.ts +++ b/sdk/datafactory/arm-datafactory/src/operations/triggerRuns.ts @@ -66,6 +66,46 @@ export class TriggerRuns { callback); } + /** + * Cancel a single trigger instance by runId. + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param triggerName The trigger name. + * @param runId The pipeline run identifier. + * @param [options] The optional parameters + * @returns Promise + */ + cancel(resourceGroupName: string, factoryName: string, triggerName: string, runId: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param triggerName The trigger name. + * @param runId The pipeline run identifier. + * @param callback The callback + */ + cancel(resourceGroupName: string, factoryName: string, triggerName: string, runId: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param triggerName The trigger name. + * @param runId The pipeline run identifier. + * @param options The optional parameters + * @param callback The callback + */ + cancel(resourceGroupName: string, factoryName: string, triggerName: string, runId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + cancel(resourceGroupName: string, factoryName: string, triggerName: string, runId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + factoryName, + triggerName, + runId, + options + }, + cancelOperationSpec, + callback); + } + /** * Query trigger runs. * @param resourceGroupName The resource group name. @@ -130,6 +170,31 @@ const rerunOperationSpec: msRest.OperationSpec = { serializer }; +const cancelOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/cancel", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.factoryName, + Parameters.triggerName, + Parameters.runId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: {}, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + const queryByFactoryOperationSpec: msRest.OperationSpec = { httpMethod: "POST", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryTriggerRuns", From f754c4e90a51d8d235b109bc5a13aa0f6ec7465b Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sat, 1 Aug 2020 01:45:19 +0000 Subject: [PATCH 2/2] Generated from b630fbb8f3473ceced4556404f4d987f85661be5 fix defn --- .../src/models/exposureControlMappers.ts | 2 + .../arm-datafactory/src/models/index.ts | 40 +++++++++++ .../arm-datafactory/src/models/mappers.ts | 46 +++++++++++++ .../src/operations/exposureControl.ts | 68 +++++++++++++++++++ 4 files changed, 156 insertions(+) diff --git a/sdk/datafactory/arm-datafactory/src/models/exposureControlMappers.ts b/sdk/datafactory/arm-datafactory/src/models/exposureControlMappers.ts index 5e2832a3c3d9..a7d062d353fd 100644 --- a/sdk/datafactory/arm-datafactory/src/models/exposureControlMappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/exposureControlMappers.ts @@ -9,6 +9,8 @@ export { discriminators, CloudError, + ExposureControlBatchRequest, + ExposureControlBatchResponse, ExposureControlRequest, ExposureControlResponse } from "../models/mappers"; diff --git a/sdk/datafactory/arm-datafactory/src/models/index.ts b/sdk/datafactory/arm-datafactory/src/models/index.ts index e779c2fe15b7..eab64323921a 100644 --- a/sdk/datafactory/arm-datafactory/src/models/index.ts +++ b/sdk/datafactory/arm-datafactory/src/models/index.ts @@ -1583,6 +1583,16 @@ export interface ExposureControlRequest { featureType?: string; } +/** + * A list of exposure control features. + */ +export interface ExposureControlBatchRequest { + /** + * List of exposure control features. + */ + exposureControlRequests: ExposureControlRequest[]; +} + /** * The exposure control response. */ @@ -1599,6 +1609,16 @@ export interface ExposureControlResponse { readonly value?: string; } +/** + * A list of exposure control feature values. + */ +export interface ExposureControlBatchResponse { + /** + * List of exposure control feature values. + */ + exposureControlResponses: ExposureControlResponse[]; +} + /** * The folder that this data flow is in. If not specified, Data flow will appear at the root level. */ @@ -24820,6 +24840,26 @@ export type ExposureControlGetFeatureValueByFactoryResponse = ExposureControlRes }; }; +/** + * Contains response data for the queryFeatureValuesByFactory operation. + */ +export type ExposureControlQueryFeatureValuesByFactoryResponse = ExposureControlBatchResponse & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: ExposureControlBatchResponse; + }; +}; + /** * Contains response data for the listByFactory operation. */ diff --git a/sdk/datafactory/arm-datafactory/src/models/mappers.ts b/sdk/datafactory/arm-datafactory/src/models/mappers.ts index 56b5b623ab64..d12aa137be0e 100644 --- a/sdk/datafactory/arm-datafactory/src/models/mappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/mappers.ts @@ -2686,6 +2686,29 @@ export const ExposureControlRequest: msRest.CompositeMapper = { } }; +export const ExposureControlBatchRequest: msRest.CompositeMapper = { + serializedName: "ExposureControlBatchRequest", + type: { + name: "Composite", + className: "ExposureControlBatchRequest", + modelProperties: { + exposureControlRequests: { + required: true, + serializedName: "exposureControlRequests", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ExposureControlRequest" + } + } + } + } + } + } +}; + export const ExposureControlResponse: msRest.CompositeMapper = { serializedName: "ExposureControlResponse", type: { @@ -2710,6 +2733,29 @@ export const ExposureControlResponse: msRest.CompositeMapper = { } }; +export const ExposureControlBatchResponse: msRest.CompositeMapper = { + serializedName: "ExposureControlBatchResponse", + type: { + name: "Composite", + className: "ExposureControlBatchResponse", + modelProperties: { + exposureControlResponses: { + required: true, + serializedName: "exposureControlResponses", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ExposureControlResponse" + } + } + } + } + } + } +}; + export const DataFlowFolder: msRest.CompositeMapper = { serializedName: "DataFlow_folder", type: { diff --git a/sdk/datafactory/arm-datafactory/src/operations/exposureControl.ts b/sdk/datafactory/arm-datafactory/src/operations/exposureControl.ts index fb3914a8e571..1f524928b17e 100644 --- a/sdk/datafactory/arm-datafactory/src/operations/exposureControl.ts +++ b/sdk/datafactory/arm-datafactory/src/operations/exposureControl.ts @@ -93,6 +93,42 @@ export class ExposureControl { getFeatureValueByFactoryOperationSpec, callback) as Promise; } + + /** + * Get list of exposure control features for specific factory. + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param exposureControlBatchRequest The exposure control request for list of features. + * @param [options] The optional parameters + * @returns Promise + */ + queryFeatureValuesByFactory(resourceGroupName: string, factoryName: string, exposureControlBatchRequest: Models.ExposureControlBatchRequest, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param exposureControlBatchRequest The exposure control request for list of features. + * @param callback The callback + */ + queryFeatureValuesByFactory(resourceGroupName: string, factoryName: string, exposureControlBatchRequest: Models.ExposureControlBatchRequest, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The resource group name. + * @param factoryName The factory name. + * @param exposureControlBatchRequest The exposure control request for list of features. + * @param options The optional parameters + * @param callback The callback + */ + queryFeatureValuesByFactory(resourceGroupName: string, factoryName: string, exposureControlBatchRequest: Models.ExposureControlBatchRequest, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + queryFeatureValuesByFactory(resourceGroupName: string, factoryName: string, exposureControlBatchRequest: Models.ExposureControlBatchRequest, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + factoryName, + exposureControlBatchRequest, + options + }, + queryFeatureValuesByFactoryOperationSpec, + callback) as Promise; + } } // Operation Specifications @@ -159,3 +195,35 @@ const getFeatureValueByFactoryOperationSpec: msRest.OperationSpec = { }, serializer }; + +const queryFeatureValuesByFactoryOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryFeaturesValue", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.factoryName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: "exposureControlBatchRequest", + mapper: { + ...Mappers.ExposureControlBatchRequest, + required: true + } + }, + responses: { + 200: { + bodyMapper: Mappers.ExposureControlBatchResponse + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +};