Skip to content

Commit

Permalink
CodeGen from PR 17189 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 7dcc7c0d4641c2010a627161c5b7bfd73d62646d into 5e3607a19fee8f1f12b9bc9cdfc0b684ac8e1cb8
  • Loading branch information
SDKAuto committed Dec 29, 2021
1 parent f000080 commit 8dc2166
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 45 deletions.
25 changes: 14 additions & 11 deletions sdk/datafactory/arm-datafactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Release History

## 10.0.1 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes


## 10.1.0 (2021-12-29)

**Features**

- Added Type Alias FailActivity
- Type Alias AzureDatabricksDeltaLakeLinkedService has a new parameter credential
- Type Alias AzureDatabricksDeltaLakeLinkedService has a new parameter workspaceResourceId
- Type Alias CosmosDbLinkedService has a new parameter credential
- Type Alias DynamicsLinkedService has a new parameter credential
- Type Alias GoogleAdWordsLinkedService has a new parameter connectionProperties
- Type Alias LinkedIntegrationRuntimeRbacAuthorization has a new parameter credential


## 10.0.0 (2021-12-17)

The package of @azure/arm-datafactory is using our next generation design principles since version 10.0.0, which contains breaking changes.
Expand Down
6 changes: 3 additions & 3 deletions sdk/datafactory/arm-datafactory/_meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commit": "7086ee861c3a6196bb98f8b327af11d03e545a05",
"commit": "dbd606f7641497d77bc164c8faeaa8f3645ce529",
"readme": "specification/datafactory/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/datafactory/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211207.1",
"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=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/datafactory/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211130.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
"use": "@autorest/typescript@6.0.0-alpha.16.20211207.1"
"use": "@autorest/typescript@6.0.0-alpha.16.20211130.1"
}
18 changes: 4 additions & 14 deletions sdk/datafactory/arm-datafactory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"sdk-type": "mgmt",
"author": "Microsoft Corporation",
"description": "A generated SDK for DataFactoryManagementClient.",
"version": "10.0.1",
"engines": {
"node": ">=12.0.0"
},
"version": "10.1.0",
"engines": { "node": ">=12.0.0" },
"dependencies": {
"@azure/core-lro": "^2.2.0",
"@azure/abort-controller": "^1.0.0",
Expand All @@ -16,13 +14,7 @@
"@azure/core-rest-pipeline": "^1.1.0",
"tslib": "^2.2.0"
},
"keywords": [
"node",
"azure",
"typescript",
"browser",
"isomorphic"
],
"keywords": ["node", "azure", "typescript", "browser", "isomorphic"],
"license": "MIT",
"main": "./dist/index.js",
"module": "./dist-esm/src/index.js",
Expand All @@ -49,9 +41,7 @@
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": {
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"bugs": { "url": "https://github.com/Azure/azure-sdk-for-js/issues" },
"files": [
"dist/**/*.js",
"dist/**/*.js.map",
Expand Down

This file was deleted.

25 changes: 19 additions & 6 deletions sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface Activity {
dependsOn?: ActivityDependency[];
description?: string;
name: string;
type: "Container" | "Execution" | "Copy" | "HDInsightHive" | "HDInsightPig" | "HDInsightMapReduce" | "HDInsightStreaming" | "HDInsightSpark" | "ExecuteSSISPackage" | "Custom" | "SqlServerStoredProcedure" | "ExecutePipeline" | "Delete" | "AzureDataExplorerCommand" | "Lookup" | "WebActivity" | "GetMetadata" | "IfCondition" | "Switch" | "ForEach" | "AzureMLBatchExecution" | "AzureMLUpdateResource" | "AzureMLExecutePipeline" | "DataLakeAnalyticsU-SQL" | "Wait" | "Until" | "Validation" | "Filter" | "DatabricksNotebook" | "DatabricksSparkJar" | "DatabricksSparkPython" | "SetVariable" | "AppendVariable" | "AzureFunctionActivity" | "WebHook" | "ExecuteDataFlow" | "ExecuteWranglingDataflow";
type: "Container" | "Execution" | "Copy" | "HDInsightHive" | "HDInsightPig" | "HDInsightMapReduce" | "HDInsightStreaming" | "HDInsightSpark" | "ExecuteSSISPackage" | "Custom" | "SqlServerStoredProcedure" | "ExecutePipeline" | "Delete" | "AzureDataExplorerCommand" | "Lookup" | "WebActivity" | "GetMetadata" | "IfCondition" | "Switch" | "ForEach" | "AzureMLBatchExecution" | "AzureMLUpdateResource" | "AzureMLExecutePipeline" | "DataLakeAnalyticsU-SQL" | "Wait" | "Fail" | "Until" | "Validation" | "Filter" | "DatabricksNotebook" | "DatabricksSparkJar" | "DatabricksSparkPython" | "SetVariable" | "AppendVariable" | "AzureFunctionActivity" | "WebHook" | "ExecuteDataFlow" | "ExecuteWranglingDataflow";
userProperties?: UserProperty[];
}

Expand Down Expand Up @@ -507,6 +507,8 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & {
accessToken?: SecretBaseUnion;
clusterId?: Record<string, unknown>;
encryptedCredential?: Record<string, unknown>;
credential?: CredentialReference;
workspaceResourceId?: Record<string, unknown>;
};

// @public
Expand Down Expand Up @@ -1267,11 +1269,11 @@ export interface ConnectionStateProperties {

// @public
export type ControlActivity = Activity & {
type: "Container" | "ExecutePipeline" | "IfCondition" | "Switch" | "ForEach" | "Wait" | "Until" | "Validation" | "Filter" | "SetVariable" | "AppendVariable" | "WebHook";
type: "Container" | "ExecutePipeline" | "IfCondition" | "Switch" | "ForEach" | "Wait" | "Fail" | "Until" | "Validation" | "Filter" | "SetVariable" | "AppendVariable" | "WebHook";
};

// @public (undocumented)
export type ControlActivityUnion = ControlActivity | ExecutePipelineActivity | IfConditionActivity | SwitchActivity | ForEachActivity | WaitActivity | UntilActivity | ValidationActivity | FilterActivity | SetVariableActivity | AppendVariableActivity | WebHookActivity;
export type ControlActivityUnion = ControlActivity | ExecutePipelineActivity | IfConditionActivity | SwitchActivity | ForEachActivity | WaitActivity | FailActivity | UntilActivity | ValidationActivity | FilterActivity | SetVariableActivity | AppendVariableActivity | WebHookActivity;

// @public
export type CopyActivity = ExecutionActivity & {
Expand Down Expand Up @@ -1358,6 +1360,7 @@ export type CosmosDbLinkedService = LinkedService & {
azureCloudType?: Record<string, unknown>;
connectionMode?: CosmosDbConnectionMode;
encryptedCredential?: Record<string, unknown>;
credential?: CredentialReference;
};

// @public
Expand Down Expand Up @@ -2272,6 +2275,7 @@ export type DynamicsLinkedService = LinkedService & {
servicePrincipalCredentialType?: Record<string, unknown>;
servicePrincipalCredential?: SecretBaseUnion;
encryptedCredential?: Record<string, unknown>;
credential?: CredentialReference;
};

// @public
Expand Down Expand Up @@ -2695,6 +2699,13 @@ export type FactoryVstsConfiguration = FactoryRepoConfiguration & {
tenantId?: string;
};

// @public
export type FailActivity = ControlActivity & {
type: "Fail";
message: Record<string, unknown>;
errorCode: Record<string, unknown>;
};

// @public
export type FileServerLinkedService = LinkedService & {
type: "FileServer";
Expand Down Expand Up @@ -2887,9 +2898,10 @@ export type GoogleAdWordsAuthenticationType = string;
// @public
export type GoogleAdWordsLinkedService = LinkedService & {
type: "GoogleAdWords";
clientCustomerID: Record<string, unknown>;
developerToken: SecretBaseUnion;
authenticationType: GoogleAdWordsAuthenticationType;
connectionProperties?: Record<string, unknown>;
clientCustomerID?: Record<string, unknown>;
developerToken?: SecretBaseUnion;
authenticationType?: GoogleAdWordsAuthenticationType;
refreshToken?: SecretBaseUnion;
clientId?: Record<string, unknown>;
clientSecret?: SecretBaseUnion;
Expand Down Expand Up @@ -4930,6 +4942,7 @@ export type LinkedIntegrationRuntimeKeyAuthorization = LinkedIntegrationRuntimeT
export type LinkedIntegrationRuntimeRbacAuthorization = LinkedIntegrationRuntimeType & {
authorizationType: "RBAC";
resourceId: string;
credential?: CredentialReference;
};

// @public
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class DataFactoryManagementClient extends coreClient.ServiceClient {
credential: credentials
};

const packageDetails = `azsdk-js-arm-datafactory/10.0.0`;
const packageDetails = `azsdk-js-arm-datafactory/10.1.0`;
const userAgentPrefix =
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
Expand Down
31 changes: 28 additions & 3 deletions sdk/datafactory/arm-datafactory/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ export type ControlActivityUnion =
| SwitchActivity
| ForEachActivity
| WaitActivity
| FailActivity
| UntilActivity
| ValidationActivity
| FilterActivity
Expand Down Expand Up @@ -1532,6 +1533,7 @@ export interface Activity {
| "AzureMLExecutePipeline"
| "DataLakeAnalyticsU-SQL"
| "Wait"
| "Fail"
| "Until"
| "Validation"
| "Filter"
Expand Down Expand Up @@ -4109,6 +4111,8 @@ export type CosmosDbLinkedService = LinkedService & {
connectionMode?: CosmosDbConnectionMode;
/** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */
encryptedCredential?: Record<string, unknown>;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
};

/** Dynamics linked service. */
Expand Down Expand Up @@ -4139,6 +4143,8 @@ export type DynamicsLinkedService = LinkedService & {
servicePrincipalCredential?: SecretBaseUnion;
/** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */
encryptedCredential?: Record<string, unknown>;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
};

/** Dynamics CRM linked service. */
Expand Down Expand Up @@ -5814,6 +5820,10 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & {
clusterId?: Record<string, unknown>;
/** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */
encryptedCredential?: Record<string, unknown>;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
/** Workspace resource id for databricks REST API. Type: string (or Expression with resultType string). */
workspaceResourceId?: Record<string, unknown>;
};

/** Responsys linked service. */
Expand Down Expand Up @@ -5878,12 +5888,14 @@ export type OracleServiceCloudLinkedService = LinkedService & {
export type GoogleAdWordsLinkedService = LinkedService & {
/** Polymorphic discriminator, which specifies the different types this object can be */
type: "GoogleAdWords";
/** Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object. */
connectionProperties?: Record<string, unknown>;
/** The Client customer ID of the AdWords account that you want to fetch report data for. */
clientCustomerID: Record<string, unknown>;
clientCustomerID?: Record<string, unknown>;
/** The developer token associated with the manager account that you use to grant access to the AdWords API. */
developerToken: SecretBaseUnion;
developerToken?: SecretBaseUnion;
/** The OAuth 2.0 authentication mechanism used for authentication. ServiceAuthentication can only be used on self-hosted IR. */
authenticationType: GoogleAdWordsAuthenticationType;
authenticationType?: GoogleAdWordsAuthenticationType;
/** The refresh token obtained from Google for authorizing access to AdWords for UserAuthentication. */
refreshToken?: SecretBaseUnion;
/** The client id of the google application used to acquire the refresh token. Type: string (or Expression with resultType string). */
Expand Down Expand Up @@ -6993,6 +7005,7 @@ export type ControlActivity = Activity & {
| "Switch"
| "ForEach"
| "Wait"
| "Fail"
| "Until"
| "Validation"
| "Filter"
Expand Down Expand Up @@ -7456,6 +7469,8 @@ export type LinkedIntegrationRuntimeRbacAuthorization = LinkedIntegrationRuntime
authorizationType: "RBAC";
/** The resource identifier of the integration runtime to be shared. */
resourceId: string;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
};

/** A WebLinkedService that uses anonymous authentication to communicate with an HTTP endpoint. */
Expand Down Expand Up @@ -9091,6 +9106,16 @@ export type WaitActivity = ControlActivity & {
waitTimeInSeconds: Record<string, unknown>;
};

/** Fails within the activity scope and provides a custom error message and error code. */
export type FailActivity = ControlActivity & {
/** Polymorphic discriminator, which specifies the different types this object can be */
type: "Fail";
/** The error message that surfaced in the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string). */
message: Record<string, unknown>;
/** The error code that categorizes the error type of the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string). */
errorCode: Record<string, unknown>;
};

/** This activity executes inner activities until the specified boolean expression results to true or timeout is reached, whichever is earlier. */
export type UntilActivity = ControlActivity & {
/** Polymorphic discriminator, which specifies the different types this object can be */
Expand Down
Loading

0 comments on commit 8dc2166

Please sign in to comment.