Skip to content

datafactory-track1 #17865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiaozha merged 1 commit into from
Sep 28, 2021
Merged

datafactory-track1 #17865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/datafactory/arm-datafactory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@azure/arm-datafactory",
"author": "Microsoft Corporation",
"description": "DataFactoryManagementClient Library with typescript type definitions for node.js and browser.",
"version": "8.0.0",
"version": "8.1.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/datafactory/arm-datafactory/src/dataFactoryManagementClientContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
import { TokenCredential } from "@azure/core-auth";

const packageName = "@azure/arm-datafactory";
const packageVersion = "8.0.0";
const packageVersion = "8.1.0";

export class DataFactoryManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials | TokenCredential;
Expand Down
11 changes: 8 additions & 3 deletions sdk/datafactory/arm-datafactory/src/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8365,7 +8365,8 @@ export interface AzureBatchLinkedService {
export interface SqlAlwaysEncryptedProperties {
/**
* Sql always encrypted AKV authentication type. Type: string (or Expression with resultType
* string). Possible values include: 'ServicePrincipal', 'ManagedIdentity'
* string). Possible values include: 'ServicePrincipal', 'ManagedIdentity',
* 'UserAssignedManagedIdentity'
*/
alwaysEncryptedAkvAuthType: SqlAlwaysEncryptedAkvAuthType;
/**
Expand All @@ -8377,6 +8378,10 @@ export interface SqlAlwaysEncryptedProperties {
* The key of the service principal used to authenticate against Azure Key Vault.
*/
servicePrincipalKey?: SecretBaseUnion;
/**
* The credential reference containing authentication information.
*/
credential?: CredentialReference;
}

/**
Expand Down Expand Up @@ -27560,11 +27565,11 @@ export type CosmosDbConnectionMode = 'Gateway' | 'Direct';

/**
* Defines values for SqlAlwaysEncryptedAkvAuthType.
* Possible values include: 'ServicePrincipal', 'ManagedIdentity'
* Possible values include: 'ServicePrincipal', 'ManagedIdentity', 'UserAssignedManagedIdentity'
* @readonly
* @enum {string}
*/
export type SqlAlwaysEncryptedAkvAuthType = 'ServicePrincipal' | 'ManagedIdentity';
export type SqlAlwaysEncryptedAkvAuthType = 'ServicePrincipal' | 'ManagedIdentity' | 'UserAssignedManagedIdentity';

/**
* Defines values for TumblingWindowFrequency.
Expand Down
12 changes: 12 additions & 0 deletions sdk/datafactory/arm-datafactory/src/models/mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10222,6 +10222,18 @@ export const SqlAlwaysEncryptedProperties: msRest.CompositeMapper = {
name: "Composite",
className: "SecretBase"
}
},
credential: {
serializedName: "credential",
type: {
name: "Composite",
className: "CredentialReference",
additionalProperties: {
type: {
name: "Object"
}
}
}
}
}
}
Expand Down