diff --git a/sdk/datafactory/arm-datafactory/CHANGELOG.md b/sdk/datafactory/arm-datafactory/CHANGELOG.md index 4f88691ade00..df6c046d835e 100644 --- a/sdk/datafactory/arm-datafactory/CHANGELOG.md +++ b/sdk/datafactory/arm-datafactory/CHANGELOG.md @@ -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. diff --git a/sdk/datafactory/arm-datafactory/_meta.json b/sdk/datafactory/arm-datafactory/_meta.json index 9bc3c521e4ad..e3b939fac376 100644 --- a/sdk/datafactory/arm-datafactory/_meta.json +++ b/sdk/datafactory/arm-datafactory/_meta.json @@ -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" } \ No newline at end of file diff --git a/sdk/datafactory/arm-datafactory/package.json b/sdk/datafactory/arm-datafactory/package.json index 0cff714fc93b..9042cd566fd1 100644 --- a/sdk/datafactory/arm-datafactory/package.json +++ b/sdk/datafactory/arm-datafactory/package.json @@ -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", @@ -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", @@ -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", diff --git a/sdk/datafactory/arm-datafactory/recordings/node/my_test/recording_sample_test.js b/sdk/datafactory/arm-datafactory/recordings/node/my_test/recording_sample_test.js deleted file mode 100644 index 0f6ecb857acf..000000000000 --- a/sdk/datafactory/arm-datafactory/recordings/node/my_test/recording_sample_test.js +++ /dev/null @@ -1,5 +0,0 @@ -let nock = require('nock'); - -module.exports.hash = "7a6be38bb8cb644d64b4094802301751"; - -module.exports.testInfo = {"uniqueName":{},"newDate":{}} diff --git a/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md b/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md index 088e087cd8fd..eb976ac2e535 100644 --- a/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md +++ b/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md @@ -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[]; } @@ -507,6 +507,8 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & { accessToken?: SecretBaseUnion; clusterId?: Record; encryptedCredential?: Record; + credential?: CredentialReference; + workspaceResourceId?: Record; }; // @public @@ -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 & { @@ -1358,6 +1360,7 @@ export type CosmosDbLinkedService = LinkedService & { azureCloudType?: Record; connectionMode?: CosmosDbConnectionMode; encryptedCredential?: Record; + credential?: CredentialReference; }; // @public @@ -2272,6 +2275,7 @@ export type DynamicsLinkedService = LinkedService & { servicePrincipalCredentialType?: Record; servicePrincipalCredential?: SecretBaseUnion; encryptedCredential?: Record; + credential?: CredentialReference; }; // @public @@ -2695,6 +2699,13 @@ export type FactoryVstsConfiguration = FactoryRepoConfiguration & { tenantId?: string; }; +// @public +export type FailActivity = ControlActivity & { + type: "Fail"; + message: Record; + errorCode: Record; +}; + // @public export type FileServerLinkedService = LinkedService & { type: "FileServer"; @@ -2887,9 +2898,10 @@ export type GoogleAdWordsAuthenticationType = string; // @public export type GoogleAdWordsLinkedService = LinkedService & { type: "GoogleAdWords"; - clientCustomerID: Record; - developerToken: SecretBaseUnion; - authenticationType: GoogleAdWordsAuthenticationType; + connectionProperties?: Record; + clientCustomerID?: Record; + developerToken?: SecretBaseUnion; + authenticationType?: GoogleAdWordsAuthenticationType; refreshToken?: SecretBaseUnion; clientId?: Record; clientSecret?: SecretBaseUnion; @@ -4930,6 +4942,7 @@ export type LinkedIntegrationRuntimeKeyAuthorization = LinkedIntegrationRuntimeT export type LinkedIntegrationRuntimeRbacAuthorization = LinkedIntegrationRuntimeType & { authorizationType: "RBAC"; resourceId: string; + credential?: CredentialReference; }; // @public diff --git a/sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts b/sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts index b75a89ead10a..c21d0a1e2bee 100644 --- a/sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts +++ b/sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts @@ -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}` diff --git a/sdk/datafactory/arm-datafactory/src/models/index.ts b/sdk/datafactory/arm-datafactory/src/models/index.ts index 5a709317b6a3..b0c2f37245ba 100644 --- a/sdk/datafactory/arm-datafactory/src/models/index.ts +++ b/sdk/datafactory/arm-datafactory/src/models/index.ts @@ -429,6 +429,7 @@ export type ControlActivityUnion = | SwitchActivity | ForEachActivity | WaitActivity + | FailActivity | UntilActivity | ValidationActivity | FilterActivity @@ -1532,6 +1533,7 @@ export interface Activity { | "AzureMLExecutePipeline" | "DataLakeAnalyticsU-SQL" | "Wait" + | "Fail" | "Until" | "Validation" | "Filter" @@ -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; + /** The credential reference containing authentication information. */ + credential?: CredentialReference; }; /** Dynamics linked service. */ @@ -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; + /** The credential reference containing authentication information. */ + credential?: CredentialReference; }; /** Dynamics CRM linked service. */ @@ -5814,6 +5820,10 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & { clusterId?: Record; /** The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). */ encryptedCredential?: Record; + /** The credential reference containing authentication information. */ + credential?: CredentialReference; + /** Workspace resource id for databricks REST API. Type: string (or Expression with resultType string). */ + workspaceResourceId?: Record; }; /** Responsys linked service. */ @@ -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; /** The Client customer ID of the AdWords account that you want to fetch report data for. */ - clientCustomerID: Record; + clientCustomerID?: Record; /** 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). */ @@ -6993,6 +7005,7 @@ export type ControlActivity = Activity & { | "Switch" | "ForEach" | "Wait" + | "Fail" | "Until" | "Validation" | "Filter" @@ -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. */ @@ -9091,6 +9106,16 @@ export type WaitActivity = ControlActivity & { waitTimeInSeconds: Record; }; +/** 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; + /** 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; +}; + /** 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 */ diff --git a/sdk/datafactory/arm-datafactory/src/models/mappers.ts b/sdk/datafactory/arm-datafactory/src/models/mappers.ts index 9cb74d5b6e97..c3fe24b97bb8 100644 --- a/sdk/datafactory/arm-datafactory/src/models/mappers.ts +++ b/sdk/datafactory/arm-datafactory/src/models/mappers.ts @@ -8442,6 +8442,13 @@ export const CosmosDbLinkedService: coreClient.CompositeMapper = { name: "Dictionary", value: { type: { name: "any" } } } + }, + credential: { + serializedName: "typeProperties.credential", + type: { + name: "Composite", + className: "CredentialReference" + } } } } @@ -8542,6 +8549,13 @@ export const DynamicsLinkedService: coreClient.CompositeMapper = { name: "Dictionary", value: { type: { name: "any" } } } + }, + credential: { + serializedName: "typeProperties.credential", + type: { + name: "Composite", + className: "CredentialReference" + } } } } @@ -13913,6 +13927,20 @@ export const AzureDatabricksDeltaLakeLinkedService: coreClient.CompositeMapper = name: "Dictionary", value: { type: { name: "any" } } } + }, + credential: { + serializedName: "typeProperties.credential", + type: { + name: "Composite", + className: "CredentialReference" + } + }, + workspaceResourceId: { + serializedName: "typeProperties.workspaceResourceId", + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } } } } @@ -14118,9 +14146,15 @@ export const GoogleAdWordsLinkedService: coreClient.CompositeMapper = { polymorphicDiscriminator: LinkedService.type.polymorphicDiscriminator, modelProperties: { ...LinkedService.type.modelProperties, + connectionProperties: { + serializedName: "typeProperties.connectionProperties", + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } + }, clientCustomerID: { serializedName: "typeProperties.clientCustomerID", - required: true, type: { name: "Dictionary", value: { type: { name: "any" } } @@ -14135,7 +14169,6 @@ export const GoogleAdWordsLinkedService: coreClient.CompositeMapper = { }, authenticationType: { serializedName: "typeProperties.authenticationType", - required: true, type: { name: "String" } @@ -18598,6 +18631,13 @@ export const LinkedIntegrationRuntimeRbacAuthorization: coreClient.CompositeMapp type: { name: "String" } + }, + credential: { + serializedName: "credential", + type: { + name: "Composite", + className: "CredentialReference" + } } } } @@ -23281,6 +23321,36 @@ export const WaitActivity: coreClient.CompositeMapper = { } }; +export const FailActivity: coreClient.CompositeMapper = { + serializedName: "Fail", + type: { + name: "Composite", + className: "FailActivity", + uberParent: "Activity", + additionalProperties: { type: { name: "Object" } }, + polymorphicDiscriminator: Activity.type.polymorphicDiscriminator, + modelProperties: { + ...ControlActivity.type.modelProperties, + message: { + serializedName: "typeProperties.message", + required: true, + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } + }, + errorCode: { + serializedName: "typeProperties.errorCode", + required: true, + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } + } + } + } +}; + export const UntilActivity: coreClient.CompositeMapper = { serializedName: "Until", type: { @@ -27284,6 +27354,7 @@ export let discriminators = { "Activity.Switch": SwitchActivity, "Activity.ForEach": ForEachActivity, "Activity.Wait": WaitActivity, + "Activity.Fail": FailActivity, "Activity.Until": UntilActivity, "Activity.Validation": ValidationActivity, "Activity.Filter": FilterActivity,