From 1347ae07afb9e86e8d46d410f384f274efb676aa Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 21 Dec 2021 03:07:57 +0000 Subject: [PATCH] CodeGen from PR 17139 in Azure/azure-rest-api-specs [Azure Data Factory] Support UAMI M2 (#17139) * Enable excel in public swagger * update * rollback dataflow change * Support UAMI in ADF - M2 * UPDATE Co-authored-by: zhanyu2014 --- sdk/datafactory/arm-datafactory/CHANGELOG.md | 24 +++++----- sdk/datafactory/arm-datafactory/_meta.json | 6 +-- sdk/datafactory/arm-datafactory/package.json | 18 ++------ .../node/my_test/recording_sample_test.js | 5 --- .../review/arm-datafactory.api.md | 12 +++-- .../src/dataFactoryManagementClient.ts | 2 +- .../arm-datafactory/src/models/index.ts | 18 ++++++-- .../arm-datafactory/src/models/mappers.ts | 44 ++++++++++++++++++- 8 files changed, 87 insertions(+), 42 deletions(-) delete mode 100644 sdk/datafactory/arm-datafactory/recordings/node/my_test/recording_sample_test.js diff --git a/sdk/datafactory/arm-datafactory/CHANGELOG.md b/sdk/datafactory/arm-datafactory/CHANGELOG.md index 4f88691ade00..3849c0a859ac 100644 --- a/sdk/datafactory/arm-datafactory/CHANGELOG.md +++ b/sdk/datafactory/arm-datafactory/CHANGELOG.md @@ -1,15 +1,17 @@ # Release History - -## 10.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + +## 10.1.0 (2021-12-21) + +**Features** + + - 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..6de9d1c609d0 100644 --- a/sdk/datafactory/arm-datafactory/_meta.json +++ b/sdk/datafactory/arm-datafactory/_meta.json @@ -1,7 +1,7 @@ { - "commit": "7086ee861c3a6196bb98f8b327af11d03e545a05", + "commit": "a2e38acb8fda1acd3dab7947aadc0e9560bdd2d9", "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..29cbee93682b 100644 --- a/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md +++ b/sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md @@ -507,6 +507,8 @@ export type AzureDatabricksDeltaLakeLinkedService = LinkedService & { accessToken?: SecretBaseUnion; clusterId?: Record; encryptedCredential?: Record; + credential?: CredentialReference; + workspaceResourceId?: Record; }; // @public @@ -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 @@ -2887,9 +2891,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 +4935,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..89da0a7a0682 100644 --- a/sdk/datafactory/arm-datafactory/src/models/index.ts +++ b/sdk/datafactory/arm-datafactory/src/models/index.ts @@ -4109,6 +4109,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 +4141,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 +5818,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 +5886,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). */ @@ -7456,6 +7466,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. */ diff --git a/sdk/datafactory/arm-datafactory/src/models/mappers.ts b/sdk/datafactory/arm-datafactory/src/models/mappers.ts index 9cb74d5b6e97..c5a09bf7a8e1 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" + } } } }