Skip to content

Commit

Permalink
CodeGen from PR 17139 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[Azure Data Factory] Support UAMI M2  (Azure#17139)

* Enable excel in public swagger

* update

* rollback dataflow change

* Support UAMI in ADF - M2

* UPDATE

Co-authored-by: zhanyu2014 <[email protected]>
  • Loading branch information
SDKAuto and zhanyu2024 committed Dec 21, 2021
1 parent 4d58b11 commit 1347ae0
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 42 deletions.
24 changes: 13 additions & 11 deletions sdk/datafactory/arm-datafactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
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": "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/[email protected].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/[email protected].20211130.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
"use": "@autorest/[email protected].20211207.1"
"use": "@autorest/[email protected].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.

12 changes: 9 additions & 3 deletions sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md
Original file line number Diff line number Diff line change
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 @@ -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 @@ -2887,9 +2891,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 +4935,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
18 changes: 15 additions & 3 deletions sdk/datafactory/arm-datafactory/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, unknown>;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
};

/** Dynamics linked service. */
Expand Down Expand Up @@ -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<string, unknown>;
/** The credential reference containing authentication information. */
credential?: CredentialReference;
};

/** Dynamics CRM linked service. */
Expand Down Expand Up @@ -5814,6 +5818,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 +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<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 @@ -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. */
Expand Down
44 changes: 42 additions & 2 deletions sdk/datafactory/arm-datafactory/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8442,6 +8442,13 @@ export const CosmosDbLinkedService: coreClient.CompositeMapper = {
name: "Dictionary",
value: { type: { name: "any" } }
}
},
credential: {
serializedName: "typeProperties.credential",
type: {
name: "Composite",
className: "CredentialReference"
}
}
}
}
Expand Down Expand Up @@ -8542,6 +8549,13 @@ export const DynamicsLinkedService: coreClient.CompositeMapper = {
name: "Dictionary",
value: { type: { name: "any" } }
}
},
credential: {
serializedName: "typeProperties.credential",
type: {
name: "Composite",
className: "CredentialReference"
}
}
}
}
Expand Down Expand Up @@ -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" } }
}
}
}
}
Expand Down Expand Up @@ -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" } }
Expand All @@ -14135,7 +14169,6 @@ export const GoogleAdWordsLinkedService: coreClient.CompositeMapper = {
},
authenticationType: {
serializedName: "typeProperties.authenticationType",
required: true,
type: {
name: "String"
}
Expand Down Expand Up @@ -18598,6 +18631,13 @@ export const LinkedIntegrationRuntimeRbacAuthorization: coreClient.CompositeMapp
type: {
name: "String"
}
},
credential: {
serializedName: "credential",
type: {
name: "Composite",
className: "CredentialReference"
}
}
}
}
Expand Down

0 comments on commit 1347ae0

Please sign in to comment.