Skip to content

Commit 622537f

Browse files
author
SDKAuto
committed
CodeGen from PR 17189 in Azure/azure-rest-api-specs
Merge 62cccf308c092d22c0da66d18e4e3a55014dc551 into 30fca88fa23112e4296322f38610e02da522d390
1 parent dbbce26 commit 622537f

File tree

9 files changed

+165
-46
lines changed

9 files changed

+165
-46
lines changed

sdk/datafactory/arm-datafactory/CHANGELOG.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# Release History
2-
3-
## 10.0.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
2+
3+
## 10.1.0 (2022-01-05)
4+
5+
**Features**
6+
7+
- Added Type Alias FailActivity
8+
- Type Alias AzureBlobFSLinkedService has a new parameter servicePrincipalCredentialType
9+
- Type Alias AzureBlobFSLinkedService has a new parameter servicePrincipalCredential
10+
- Type Alias AzureDatabricksDeltaLakeLinkedService has a new parameter credential
11+
- Type Alias AzureDatabricksDeltaLakeLinkedService has a new parameter workspaceResourceId
12+
- Type Alias CosmosDbLinkedService has a new parameter credential
13+
- Type Alias DynamicsLinkedService has a new parameter credential
14+
- Type Alias GoogleAdWordsLinkedService has a new parameter connectionProperties
15+
- Type Alias LinkedIntegrationRuntimeRbacAuthorization has a new parameter credential
16+
17+
1318
## 10.0.0 (2021-12-17)
1419

1520
The package of @azure/arm-datafactory is using our next generation design principles since version 10.0.0, which contains breaking changes.

sdk/datafactory/arm-datafactory/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Microsoft
3+
Copyright (c) 2022 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"commit": "7086ee861c3a6196bb98f8b327af11d03e545a05",
2+
"commit": "945bb83f8a6541a32ca190e7b0a86cac4299a6e3",
33
"readme": "specification/datafactory/resource-manager/readme.md",
4-
"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/[email protected].20211207.1",
4+
"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/[email protected].20211130.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/[email protected].20211207.1"
6+
"use": "@autorest/[email protected].20211130.1"
77
}

sdk/datafactory/arm-datafactory/package.json

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for DataFactoryManagementClient.",
6-
"version": "10.0.1",
7-
"engines": {
8-
"node": ">=12.0.0"
9-
},
6+
"version": "10.1.0",
7+
"engines": { "node": ">=12.0.0" },
108
"dependencies": {
119
"@azure/core-lro": "^2.2.0",
1210
"@azure/abort-controller": "^1.0.0",
@@ -16,13 +14,7 @@
1614
"@azure/core-rest-pipeline": "^1.1.0",
1715
"tslib": "^2.2.0"
1816
},
19-
"keywords": [
20-
"node",
21-
"azure",
22-
"typescript",
23-
"browser",
24-
"isomorphic"
25-
],
17+
"keywords": ["node", "azure", "typescript", "browser", "isomorphic"],
2618
"license": "MIT",
2719
"main": "./dist/index.js",
2820
"module": "./dist-esm/src/index.js",
@@ -49,9 +41,7 @@
4941
"type": "git",
5042
"url": "https://github.com/Azure/azure-sdk-for-js.git"
5143
},
52-
"bugs": {
53-
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
54-
},
44+
"bugs": { "url": "https://github.com/Azure/azure-sdk-for-js/issues" },
5545
"files": [
5646
"dist/**/*.js",
5747
"dist/**/*.js.map",

sdk/datafactory/arm-datafactory/recordings/node/my_test/recording_sample_test.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface Activity {
2323
dependsOn?: ActivityDependency[];
2424
description?: string;
2525
name: string;
26-
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";
26+
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";
2727
userProperties?: UserProperty[];
2828
}
2929

@@ -392,6 +392,8 @@ export type AzureBlobFSLinkedService = LinkedService & {
392392
azureCloudType?: Record<string, unknown>;
393393
encryptedCredential?: Record<string, unknown>;
394394
credential?: CredentialReference;
395+
servicePrincipalCredentialType?: Record<string, unknown>;
396+
servicePrincipalCredential?: SecretBaseUnion;
395397
};
396398

397399
// @public
@@ -507,6 +509,8 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & {
507509
accessToken?: SecretBaseUnion;
508510
clusterId?: Record<string, unknown>;
509511
encryptedCredential?: Record<string, unknown>;
512+
credential?: CredentialReference;
513+
workspaceResourceId?: Record<string, unknown>;
510514
};
511515

512516
// @public
@@ -1267,11 +1271,11 @@ export interface ConnectionStateProperties {
12671271

12681272
// @public
12691273
export type ControlActivity = Activity & {
1270-
type: "Container" | "ExecutePipeline" | "IfCondition" | "Switch" | "ForEach" | "Wait" | "Until" | "Validation" | "Filter" | "SetVariable" | "AppendVariable" | "WebHook";
1274+
type: "Container" | "ExecutePipeline" | "IfCondition" | "Switch" | "ForEach" | "Wait" | "Fail" | "Until" | "Validation" | "Filter" | "SetVariable" | "AppendVariable" | "WebHook";
12711275
};
12721276

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

12761280
// @public
12771281
export type CopyActivity = ExecutionActivity & {
@@ -1358,6 +1362,7 @@ export type CosmosDbLinkedService = LinkedService & {
13581362
azureCloudType?: Record<string, unknown>;
13591363
connectionMode?: CosmosDbConnectionMode;
13601364
encryptedCredential?: Record<string, unknown>;
1365+
credential?: CredentialReference;
13611366
};
13621367

13631368
// @public
@@ -2272,6 +2277,7 @@ export type DynamicsLinkedService = LinkedService & {
22722277
servicePrincipalCredentialType?: Record<string, unknown>;
22732278
servicePrincipalCredential?: SecretBaseUnion;
22742279
encryptedCredential?: Record<string, unknown>;
2280+
credential?: CredentialReference;
22752281
};
22762282

22772283
// @public
@@ -2695,6 +2701,13 @@ export type FactoryVstsConfiguration = FactoryRepoConfiguration & {
26952701
tenantId?: string;
26962702
};
26972703

2704+
// @public
2705+
export type FailActivity = ControlActivity & {
2706+
type: "Fail";
2707+
message: Record<string, unknown>;
2708+
errorCode: Record<string, unknown>;
2709+
};
2710+
26982711
// @public
26992712
export type FileServerLinkedService = LinkedService & {
27002713
type: "FileServer";
@@ -2887,9 +2900,10 @@ export type GoogleAdWordsAuthenticationType = string;
28872900
// @public
28882901
export type GoogleAdWordsLinkedService = LinkedService & {
28892902
type: "GoogleAdWords";
2890-
clientCustomerID: Record<string, unknown>;
2891-
developerToken: SecretBaseUnion;
2892-
authenticationType: GoogleAdWordsAuthenticationType;
2903+
connectionProperties?: Record<string, unknown>;
2904+
clientCustomerID?: Record<string, unknown>;
2905+
developerToken?: SecretBaseUnion;
2906+
authenticationType?: GoogleAdWordsAuthenticationType;
28932907
refreshToken?: SecretBaseUnion;
28942908
clientId?: Record<string, unknown>;
28952909
clientSecret?: SecretBaseUnion;
@@ -4930,6 +4944,7 @@ export type LinkedIntegrationRuntimeKeyAuthorization = LinkedIntegrationRuntimeT
49304944
export type LinkedIntegrationRuntimeRbacAuthorization = LinkedIntegrationRuntimeType & {
49314945
authorizationType: "RBAC";
49324946
resourceId: string;
4947+
credential?: CredentialReference;
49334948
};
49344949

49354950
// @public

sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class DataFactoryManagementClient extends coreClient.ServiceClient {
8686
credential: credentials
8787
};
8888

89-
const packageDetails = `azsdk-js-arm-datafactory/10.0.0`;
89+
const packageDetails = `azsdk-js-arm-datafactory/10.1.0`;
9090
const userAgentPrefix =
9191
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
9292
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

sdk/datafactory/arm-datafactory/src/models/index.ts

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ export type ControlActivityUnion =
429429
| SwitchActivity
430430
| ForEachActivity
431431
| WaitActivity
432+
| FailActivity
432433
| UntilActivity
433434
| ValidationActivity
434435
| FilterActivity
@@ -1532,6 +1533,7 @@ export interface Activity {
15321533
| "AzureMLExecutePipeline"
15331534
| "DataLakeAnalyticsU-SQL"
15341535
| "Wait"
1536+
| "Fail"
15351537
| "Until"
15361538
| "Validation"
15371539
| "Filter"
@@ -4109,6 +4111,8 @@ export type CosmosDbLinkedService = LinkedService & {
41094111
connectionMode?: CosmosDbConnectionMode;
41104112
/** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */
41114113
encryptedCredential?: Record<string, unknown>;
4114+
/** The credential reference containing authentication information. */
4115+
credential?: CredentialReference;
41124116
};
41134117

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

41444150
/** Dynamics CRM linked service. */
@@ -4705,6 +4711,10 @@ export type AzureBlobFSLinkedService = LinkedService & {
47054711
encryptedCredential?: Record<string, unknown>;
47064712
/** The credential reference containing authentication information. */
47074713
credential?: CredentialReference;
4714+
/** The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string). */
4715+
servicePrincipalCredentialType?: Record<string, unknown>;
4716+
/** The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. */
4717+
servicePrincipalCredential?: SecretBaseUnion;
47084718
};
47094719

47104720
/** Office365 linked service. */
@@ -5814,6 +5824,10 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & {
58145824
clusterId?: Record<string, unknown>;
58155825
/** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */
58165826
encryptedCredential?: Record<string, unknown>;
5827+
/** The credential reference containing authentication information. */
5828+
credential?: CredentialReference;
5829+
/** Workspace resource id for databricks REST API. Type: string (or Expression with resultType string). */
5830+
workspaceResourceId?: Record<string, unknown>;
58175831
};
58185832

58195833
/** Responsys linked service. */
@@ -5878,12 +5892,14 @@ export type OracleServiceCloudLinkedService = LinkedService & {
58785892
export type GoogleAdWordsLinkedService = LinkedService & {
58795893
/** Polymorphic discriminator, which specifies the different types this object can be */
58805894
type: "GoogleAdWords";
5895+
/** Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object. */
5896+
connectionProperties?: Record<string, unknown>;
58815897
/** The Client customer ID of the AdWords account that you want to fetch report data for. */
5882-
clientCustomerID: Record<string, unknown>;
5898+
clientCustomerID?: Record<string, unknown>;
58835899
/** The developer token associated with the manager account that you use to grant access to the AdWords API. */
5884-
developerToken: SecretBaseUnion;
5900+
developerToken?: SecretBaseUnion;
58855901
/** The OAuth 2.0 authentication mechanism used for authentication. ServiceAuthentication can only be used on self-hosted IR. */
5886-
authenticationType: GoogleAdWordsAuthenticationType;
5902+
authenticationType?: GoogleAdWordsAuthenticationType;
58875903
/** The refresh token obtained from Google for authorizing access to AdWords for UserAuthentication. */
58885904
refreshToken?: SecretBaseUnion;
58895905
/** The client id of the google application used to acquire the refresh token. Type: string (or Expression with resultType string). */
@@ -6993,6 +7009,7 @@ export type ControlActivity = Activity & {
69937009
| "Switch"
69947010
| "ForEach"
69957011
| "Wait"
7012+
| "Fail"
69967013
| "Until"
69977014
| "Validation"
69987015
| "Filter"
@@ -7456,6 +7473,8 @@ export type LinkedIntegrationRuntimeRbacAuthorization = LinkedIntegrationRuntime
74567473
authorizationType: "RBAC";
74577474
/** The resource identifier of the integration runtime to be shared. */
74587475
resourceId: string;
7476+
/** The credential reference containing authentication information. */
7477+
credential?: CredentialReference;
74597478
};
74607479

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

9113+
/** This activity will fail within its own scope and output a custom error message and error code. The error message and code can provided either as a string literal or as an expression that can be evaluated to a string at runtime. The activity scope can be the whole pipeline or a control activity (e.g. foreach, switch, until), if the fail activity is contained in it. */
9114+
export type FailActivity = ControlActivity & {
9115+
/** Polymorphic discriminator, which specifies the different types this object can be */
9116+
type: "Fail";
9117+
/** 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). */
9118+
message: Record<string, unknown>;
9119+
/** 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). */
9120+
errorCode: Record<string, unknown>;
9121+
};
9122+
90949123
/** This activity executes inner activities until the specified boolean expression results to true or timeout is reached, whichever is earlier. */
90959124
export type UntilActivity = ControlActivity & {
90969125
/** Polymorphic discriminator, which specifies the different types this object can be */

0 commit comments

Comments
 (0)