Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR @azure/arm-datafactory] Add Amazon S3 Compatible and Oracle Cloud Storage connectors #12575

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions sdk/datafactory/arm-datafactory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-datafactory

### How to use

#### nodejs - Authentication, client creation and list operations as an example written in TypeScript.
#### nodejs - client creation and list operations as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { DataFactoryManagementClient, DataFactoryManagementModels, DataFactoryManagementMappers } from "@azure/arm-datafactory";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { DataFactoryManagementClient } = require("@azure/arm-datafactory");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/datafactory/arm-datafactory/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -131,6 +131,7 @@ export {
ConnectionStateProperties,
ControlActivity,
CopyActivity,
CopyActivityLogSettings,
CopySink,
CopySource,
CosmosDbLinkedService,
Expand Down Expand Up @@ -310,6 +311,8 @@ export {
LinkedService,
LinkedServiceReference,
LinkedServiceResource,
LogLocationSettings,
LogSettings,
LogStorageSettings,
LookupActivity,
MagentoLinkedService,
Expand Down
7 changes: 5 additions & 2 deletions sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -131,6 +131,7 @@ export {
ConnectionStateProperties,
ControlActivity,
CopyActivity,
CopyActivityLogSettings,
CopySink,
CopySource,
CosmosDbLinkedService,
Expand Down Expand Up @@ -310,6 +311,8 @@ export {
LinkedService,
LinkedServiceReference,
LinkedServiceResource,
LogLocationSettings,
LogSettings,
LogStorageSettings,
LookupActivity,
MagentoLinkedService,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -132,6 +132,7 @@ export {
ConnectionStateProperties,
ControlActivity,
CopyActivity,
CopyActivityLogSettings,
CopySink,
CopySource,
CosmosDbLinkedService,
Expand Down Expand Up @@ -315,6 +316,8 @@ export {
LinkedService,
LinkedServiceReference,
LinkedServiceResource,
LogLocationSettings,
LogSettings,
LogStorageSettings,
LookupActivity,
MagentoLinkedService,
Expand Down
123 changes: 104 additions & 19 deletions sdk/datafactory/arm-datafactory/src/models/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -4814,6 +4814,11 @@ export interface ConcurLinkedService {
* List of tags that can be used for describing the linked service.
*/
annotations?: any[];
/**
* Properties used to connect to Concur. It is mutually exclusive with any other properties in
* the linked service. Type: object.
*/
connectionProperties?: any;
/**
* Application client_id supplied by Concur App Management.
*/
Expand Down Expand Up @@ -5423,6 +5428,11 @@ export interface AmazonS3LinkedService {
* List of tags that can be used for describing the linked service.
*/
annotations?: any[];
/**
* The authentication type of S3. Allowed value: AccessKey (default) or
* TemporarySecurityCredentials. Type: string (or Expression with resultType string).
*/
authenticationType?: any;
/**
* The access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type:
* string (or Expression with resultType string).
Expand All @@ -5438,6 +5448,10 @@ export interface AmazonS3LinkedService {
* between https and http. Type: string (or Expression with resultType string).
*/
serviceUrl?: any;
/**
* The session token for the S3 temporary security credential.
*/
sessionToken?: SecretBaseUnion;
/**
* The encrypted credential used for authentication. Credentials are encrypted using the
* integration runtime credential manager. Type: string (or Expression with resultType string).
Expand Down Expand Up @@ -13427,7 +13441,7 @@ export interface TumblingWindowTrigger {
*/
pipelineProperty: TriggerPipelineReference;
/**
* The frequency of the time windows. Possible values include: 'Minute', 'Hour'
* The frequency of the time windows. Possible values include: 'Minute', 'Hour', 'Month'
*/
frequency: TumblingWindowFrequency;
/**
Expand Down Expand Up @@ -13748,14 +13762,15 @@ export interface ActivityPolicy {
export interface ExecuteDataFlowActivityTypePropertiesCompute {
/**
* Compute type of the cluster which will execute data flow job. Possible values include:
* 'General', 'MemoryOptimized', 'ComputeOptimized'
* 'General', 'MemoryOptimized', 'ComputeOptimized'. Type: string (or Expression with resultType
* string)
*/
computeType?: DataFlowComputeType;
computeType?: any;
/**
* Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32,
* 48, 80, 144 and 272.
* 48, 80, 144 and 272. Type: integer (or Expression with resultType integer)
*/
coreCount?: number;
coreCount?: any;
}

/**
Expand Down Expand Up @@ -13845,6 +13860,21 @@ export interface ExecuteDataFlowActivity {
* Compute properties for data flow activity.
*/
compute?: ExecuteDataFlowActivityTypePropertiesCompute;
/**
* Trace level setting used for data flow monitoring output. Supported values are: 'coarse',
* 'fine', and 'none'. Type: string (or Expression with resultType string)
*/
traceLevel?: any;
/**
* Continue on error setting used for data flow execution. Enables processing to continue if a
* sink fails. Type: boolean (or Expression with resultType boolean)
*/
continueOnError?: any;
/**
* Concurrent run setting used for data flow execution. Allows sinks with the same save order to
* be processed concurrently. Type: boolean (or Expression with resultType boolean)
*/
runConcurrently?: any;
}

/**
Expand Down Expand Up @@ -19456,7 +19486,7 @@ export interface AzureDataExplorerCommandActivity {
}

/**
* Log storage settings.
* (Deprecated. Please use LogSettings) Log storage settings.
*/
export interface LogStorageSettings {
/**
Expand Down Expand Up @@ -20258,6 +20288,56 @@ export interface SkipErrorFile {
dataInconsistency?: any;
}

/**
* Log location settings.
*/
export interface LogLocationSettings {
/**
* Log storage linked service reference.
*/
linkedServiceName: LinkedServiceReference;
/**
* The path to storage for storing detailed logs of activity execution. Type: string (or
* Expression with resultType string).
*/
path?: any;
}

/**
* Settings for copy activity log.
*/
export interface CopyActivityLogSettings {
/**
* Gets or sets the log level, support: Info, Warning. Type: string (or Expression with
* resultType string).
*/
logLevel?: any;
/**
* Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType
* boolean).
*/
enableReliableLogging?: any;
}

/**
* Log settings.
*/
export interface LogSettings {
/**
* Specifies whether to enable copy activity log. Type: boolean (or Expression with resultType
* boolean).
*/
enableCopyActivityLog?: any;
/**
* Specifies settings for copy activity log.
*/
copyActivityLogSettings?: CopyActivityLogSettings;
/**
* Log location settings customer needs to provide when enabling log.
*/
logLocationSettings: LogLocationSettings;
}

/**
* Redirect incompatible row settings
*/
Expand Down Expand Up @@ -22479,9 +22559,14 @@ export interface CopyActivity {
*/
redirectIncompatibleRowSettings?: RedirectIncompatibleRowSettings;
/**
* Log storage settings customer need to provide when enabling session log.
* (Deprecated. Please use LogSettings) Log storage settings customer need to provide when
* enabling session log.
*/
logStorageSettings?: LogStorageSettings;
/**
* Log settings customer needs provide when enabling log.
*/
logSettings?: LogSettings;
/**
* Preserve Rules.
*/
Expand Down Expand Up @@ -25083,11 +25168,11 @@ export type AvroCompressionCodec = 'none' | 'deflate' | 'snappy' | 'xz' | 'bzip2

/**
* Defines values for TumblingWindowFrequency.
* Possible values include: 'Minute', 'Hour'
* Possible values include: 'Minute', 'Hour', 'Month'
* @readonly
* @enum {string}
*/
export type TumblingWindowFrequency = 'Minute' | 'Hour';
export type TumblingWindowFrequency = 'Minute' | 'Hour' | 'Month';

/**
* Defines values for BlobEventTypes.
Expand Down Expand Up @@ -25123,14 +25208,6 @@ export type DaysOfWeek = 'Sunday' | 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursd
*/
export type RecurrenceFrequency = 'NotSpecified' | 'Minute' | 'Hour' | 'Day' | 'Week' | 'Month' | 'Year';

/**
* Defines values for DataFlowComputeType.
* Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'
* @readonly
* @enum {string}
*/
export type DataFlowComputeType = 'General' | 'MemoryOptimized' | 'ComputeOptimized';

/**
* Defines values for AzureFunctionActivityMethod.
* Possible values include: 'GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE'
Expand Down Expand Up @@ -25366,6 +25443,14 @@ export type IntegrationRuntimeLicenseType = 'BasePrice' | 'LicenseIncluded';
*/
export type IntegrationRuntimeEdition = 'Standard' | 'Enterprise';

/**
* Defines values for DataFlowComputeType.
* Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'
* @readonly
* @enum {string}
*/
export type DataFlowComputeType = 'General' | 'MemoryOptimized' | 'ComputeOptimized';

/**
* Defines values for SsisObjectMetadataType.
* Possible values include: 'Folder', 'Project', 'Package', 'Environment'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Loading