Skip to content

Commit

Permalink
CodeGen from PR 13204 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Add authHeaders to HTTP/REST/OData Linked Service, add MultiFactor to SFTP authenticationType (Azure#13204)

* Add authHeaders to HTTP/REST/OData Linked Service, add MultiFactor to SFTP authenticationType

* Fix PrettierCheck error
  • Loading branch information
SDKAuto committed Mar 5, 2021
1 parent 601f48c commit d7189a1
Show file tree
Hide file tree
Showing 12 changed files with 135 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class DataFactoryManagementClientContext extends msRestAzure.AzureService
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}
Expand All @@ -51,10 +51,10 @@ export class DataFactoryManagementClientContext extends msRestAzure.AzureService
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
2 changes: 2 additions & 0 deletions sdk/datafactory/arm-datafactory/src/models/datasetsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
61 changes: 54 additions & 7 deletions sdk/datafactory/arm-datafactory/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ export interface AzureKeyVaultSecretReference {
* Identity properties of the factory resource.
*/
export interface FactoryIdentity {
/**
* The identity type. Possible values include: 'SystemAssigned', 'UserAssigned',
* 'SystemAssigned,UserAssigned'
*/
type: FactoryIdentityType;
/**
* The principal id of the identity.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
Expand Down Expand Up @@ -705,6 +710,23 @@ export interface PipelineFolder {
name?: string;
}

/**
* Pipeline ElapsedTime Metric Policy.
*/
export interface PipelineElapsedTimeMetricPolicy {
/**
* TimeSpan value, after which an Azure Monitoring Metric is fired.
*/
duration?: any;
}

/**
* Pipeline Policy.
*/
export interface PipelinePolicy {
elapsedTimeMetric?: PipelineElapsedTimeMetricPolicy;
}

/**
* Pipeline resource type.
*/
Expand Down Expand Up @@ -741,6 +763,7 @@ export interface PipelineResource extends SubResource {
* The folder that this Pipeline is in. If not specified, Pipeline will appear at the root level.
*/
folder?: PipelineFolder;
policy?: PipelinePolicy;
/**
* Describes unknown properties. The value of an unknown property can be of "any" type.
*/
Expand Down Expand Up @@ -5169,7 +5192,7 @@ export interface SftpServerLinkedService {
port?: any;
/**
* The authentication type to be used to connect to the FTP server. Possible values include:
* 'Basic', 'SshPublicKey'
* 'Basic', 'SshPublicKey', 'MultiFactor'
*/
authenticationType?: SftpAuthenticationType;
/**
Expand Down Expand Up @@ -5322,6 +5345,11 @@ export interface HttpLinkedService {
* authentication.
*/
password?: SecretBaseUnion;
/**
* The additional HTTP headers in the request to RESTful API used for authorization. Type: object
* (or Expression with resultType object).
*/
authHeaders?: any;
/**
* Base64 encoded certificate data for ClientCertificate authentication. For on-premises copy
* with ClientCertificate authentication, either CertThumbprint or EmbeddedCertData/Password
Expand Down Expand Up @@ -5571,6 +5599,11 @@ export interface RestServiceLinkedService {
* The password used in Basic authentication type.
*/
password?: SecretBaseUnion;
/**
* The additional HTTP headers in the request to RESTful API used for authorization. Type: object
* (or Expression with resultType object).
*/
authHeaders?: any;
/**
* The application's client ID used in AadServicePrincipal authentication type.
*/
Expand Down Expand Up @@ -6456,6 +6489,11 @@ export interface ODataLinkedService {
* Password of the OData service.
*/
password?: SecretBaseUnion;
/**
* The additional HTTP headers in the request to RESTful API used for authorization. Type: object
* (or Expression with resultType object).
*/
authHeaders?: any;
/**
* Specify the tenant information (domain name or tenant ID) under which your application
* resides. Type: string (or Expression with resultType string).
Expand Down Expand Up @@ -15354,17 +15392,18 @@ export interface WebActivityAuthentication {
pfx?: SecretBaseUnion;
/**
* Web activity authentication user name for basic authentication or ClientID when used for
* ServicePrincipal
* ServicePrincipal. Type: string (or Expression with resultType string).
*/
username?: string;
username?: any;
/**
* Password for the PFX file or basic authentication / Secret when used for ServicePrincipal
*/
password?: SecretBaseUnion;
/**
* Resource for which Azure Auth token will be requested when using MSI Authentication.
* Resource for which Azure Auth token will be requested when using MSI Authentication. Type:
* string (or Expression with resultType string).
*/
resource?: string;
resource?: any;
/**
* TenantId for which Azure Auth token will be requested when using ServicePrincipal
* Authentication. Type: string (or Expression with resultType string).
Expand Down Expand Up @@ -24961,6 +25000,14 @@ export interface ManagedPrivateEndpointListResponse extends Array<ManagedPrivate
nextLink?: string;
}

/**
* Defines values for FactoryIdentityType.
* Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned'
* @readonly
* @enum {string}
*/
export type FactoryIdentityType = 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned,UserAssigned';

/**
* Defines values for GlobalParameterType.
* Possible values include: 'Object', 'String', 'Int', 'Float', 'Bool', 'Array'
Expand Down Expand Up @@ -25202,11 +25249,11 @@ export type SapHanaAuthenticationType = 'Basic' | 'Windows';

/**
* Defines values for SftpAuthenticationType.
* Possible values include: 'Basic', 'SshPublicKey'
* Possible values include: 'Basic', 'SshPublicKey', 'MultiFactor'
* @readonly
* @enum {string}
*/
export type SftpAuthenticationType = 'Basic' | 'SshPublicKey';
export type SftpAuthenticationType = 'Basic' | 'SshPublicKey' | 'MultiFactor';

/**
* Defines values for FtpAuthenticationType.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
64 changes: 60 additions & 4 deletions sdk/datafactory/arm-datafactory/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,7 @@ export const FactoryIdentity: msRest.CompositeMapper = {
modelProperties: {
type: {
required: true,
isConstant: true,
serializedName: "type",
defaultValue: 'SystemAssigned',
type: {
name: "String"
}
Expand Down Expand Up @@ -1226,6 +1224,39 @@ export const PipelineFolder: msRest.CompositeMapper = {
}
};

export const PipelineElapsedTimeMetricPolicy: msRest.CompositeMapper = {
serializedName: "PipelineElapsedTimeMetricPolicy",
type: {
name: "Composite",
className: "PipelineElapsedTimeMetricPolicy",
modelProperties: {
duration: {
serializedName: "duration",
type: {
name: "Object"
}
}
}
}
};

export const PipelinePolicy: msRest.CompositeMapper = {
serializedName: "PipelinePolicy",
type: {
name: "Composite",
className: "PipelinePolicy",
modelProperties: {
elapsedTimeMetric: {
serializedName: "elapsedTimeMetric",
type: {
name: "Composite",
className: "PipelineElapsedTimeMetricPolicy"
}
}
}
}
};

export const PipelineResource: msRest.CompositeMapper = {
serializedName: "PipelineResource",
type: {
Expand Down Expand Up @@ -1317,6 +1348,13 @@ export const PipelineResource: msRest.CompositeMapper = {
name: "Composite",
className: "PipelineFolder"
}
},
policy: {
serializedName: "properties.policy",
type: {
name: "Composite",
className: "PipelinePolicy"
}
}
},
additionalProperties: {
Expand Down Expand Up @@ -6966,6 +7004,12 @@ export const HttpLinkedService: msRest.CompositeMapper = {
className: "SecretBase"
}
},
authHeaders: {
serializedName: "typeProperties.authHeaders",
type: {
name: "Object"
}
},
embeddedCertData: {
serializedName: "typeProperties.embeddedCertData",
type: {
Expand Down Expand Up @@ -7197,6 +7241,12 @@ export const RestServiceLinkedService: msRest.CompositeMapper = {
className: "SecretBase"
}
},
authHeaders: {
serializedName: "typeProperties.authHeaders",
type: {
name: "Object"
}
},
servicePrincipalId: {
serializedName: "typeProperties.servicePrincipalId",
type: {
Expand Down Expand Up @@ -8056,6 +8106,12 @@ export const ODataLinkedService: msRest.CompositeMapper = {
className: "SecretBase"
}
},
authHeaders: {
serializedName: "typeProperties.authHeaders",
type: {
name: "Object"
}
},
tenant: {
serializedName: "typeProperties.tenant",
type: {
Expand Down Expand Up @@ -15450,7 +15506,7 @@ export const WebActivityAuthentication: msRest.CompositeMapper = {
username: {
serializedName: "username",
type: {
name: "String"
name: "Object"
}
},
password: {
Expand All @@ -15463,7 +15519,7 @@ export const WebActivityAuthentication: msRest.CompositeMapper = {
resource: {
serializedName: "resource",
type: {
name: "String"
name: "Object"
}
},
userTenant: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,10 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelineListResponse,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down
2 changes: 2 additions & 0 deletions sdk/datafactory/arm-datafactory/src/models/triggersMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ export {
PhoenixLinkedService,
PhoenixObjectDataset,
PhoenixSource,
PipelineElapsedTimeMetricPolicy,
PipelineFolder,
PipelinePolicy,
PipelineReference,
PipelineResource,
PolybaseSettings,
Expand Down

0 comments on commit d7189a1

Please sign in to comment.