Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Generated from 41fb59ae051421c105bddd407e98a3605d17e297
update object to secret base
  • Loading branch information
AutorestCI committed Jan 18, 2019
commit 4799ac8f44525a7126b5b6cd29e76db26ee521ad
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ export {
DependencyReference,
MultiplePipelineTrigger,
AzureFunctionLinkedService,
ResponsysLinkedService,
SecretBase,
ResponsysLinkedService,
AzureDatabricksLinkedService,
AzureDataLakeAnalyticsLinkedService,
HDInsightOnDemandLinkedService,
Expand Down Expand Up @@ -250,12 +250,10 @@ export {
SetVariableActivity,
FilterActivity,
Expression,
ValidationActivity,
UntilActivity,
WaitActivity,
ForEachActivity,
IfConditionActivity,
WebHookActivity,
ExecutePipelineActivity,
LinkedIntegrationRuntimeRbacAuthorization,
LinkedIntegrationRuntimeKeyAuthorization,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export {
DependencyReference,
MultiplePipelineTrigger,
AzureFunctionLinkedService,
ResponsysLinkedService,
SecretBase,
ResponsysLinkedService,
AzureDatabricksLinkedService,
AzureDataLakeAnalyticsLinkedService,
HDInsightOnDemandLinkedService,
Expand Down Expand Up @@ -256,12 +256,10 @@ export {
SetVariableActivity,
FilterActivity,
Expression,
ValidationActivity,
UntilActivity,
WaitActivity,
ForEachActivity,
IfConditionActivity,
WebHookActivity,
ExecutePipelineActivity,
LinkedIntegrationRuntimeRbacAuthorization,
LinkedIntegrationRuntimeKeyAuthorization,
Expand Down
129 changes: 4 additions & 125 deletions packages/@azure/arm-datafactory/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2411,9 +2411,10 @@ export interface AzureFunctionLinkedService {
*/
functionAppUrl: any;
/**
* @member {any} [functionKey] Function or Host key for Azure Function App.
* @member {SecretBaseUnion} [functionKey] Function or Host key for Azure
* Function App.
*/
functionKey?: any;
functionKey?: SecretBaseUnion;
/**
* @member {any} [encryptedCredential] The encrypted credential used for
* authentication. Credentials are encrypted using the integration runtime
Expand Down Expand Up @@ -14880,7 +14881,7 @@ export interface CopyActivity {
/**
* Contains the possible cases for ControlActivity.
*/
export type ControlActivityUnion = ControlActivity | AppendVariableActivity | SetVariableActivity | FilterActivity | ValidationActivity | UntilActivity | WaitActivity | ForEachActivity | IfConditionActivity | WebHookActivity | ExecutePipelineActivity;
export type ControlActivityUnion = ControlActivity | AppendVariableActivity | SetVariableActivity | FilterActivity | UntilActivity | WaitActivity | ForEachActivity | IfConditionActivity | ExecutePipelineActivity;

/**
* @interface
Expand Down Expand Up @@ -15027,60 +15028,6 @@ export interface FilterActivity {
condition: Expression;
}

/**
* @interface
* An interface representing ValidationActivity.
* This activity blocks execution until a file has been validated to exist,
* with an optional minimum size, or the timeout is reached, whichever is
* earlier.
*
*/
export interface ValidationActivity {
/**
* @member {string} type Polymorphic Discriminator
*/
type: "Validation";
/**
* @member {string} name Activity name.
*/
name: string;
/**
* @member {string} [description] Activity description.
*/
description?: string;
/**
* @member {ActivityDependency[]} [dependsOn] Activity depends on condition.
*/
dependsOn?: ActivityDependency[];
/**
* @member {UserProperty[]} [userProperties] Activity user properties.
*/
userProperties?: UserProperty[];
/**
* @member {any} [timeout] Specifies the timeout for the activity to run. If
* there is no value specified, it takes the value of TimeSpan.FromDays(7)
* which is 1 week as default. Type: string (or Expression with resultType
* string), pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
* Type: string (or Expression with resultType string), pattern:
* ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
*/
timeout?: any;
/**
* @member {number} [sleep] A delay in seconds between validation attempts.
* If no value is specified, 10 seconds will be used as the default.
*/
sleep?: number;
/**
* @member {number} [minimumSize] Minimum size of a file in byte. If no value
* is specified, 0 byte will be used as the default.
*/
minimumSize?: number;
/**
* @member {DatasetReference} dataset Validation activity dataset reference.
*/
dataset: DatasetReference;
}

/**
* @interface
* An interface representing UntilActivity.
Expand Down Expand Up @@ -15259,66 +15206,6 @@ export interface IfConditionActivity {
ifFalseActivities?: ActivityUnion[];
}

/**
* @interface
* An interface representing WebHookActivity.
* WebHook activity.
*
*/
export interface WebHookActivity {
/**
* @member {string} type Polymorphic Discriminator
*/
type: "WebHook";
/**
* @member {string} name Activity name.
*/
name: string;
/**
* @member {string} [description] Activity description.
*/
description?: string;
/**
* @member {ActivityDependency[]} [dependsOn] Activity depends on condition.
*/
dependsOn?: ActivityDependency[];
/**
* @member {UserProperty[]} [userProperties] Activity user properties.
*/
userProperties?: UserProperty[];
/**
* @member {any} url WebHook activity target endpoint and path. Type: string
* (or Expression with resultType string).
*/
url: any;
/**
* @member {any} [timeout] Specifies the timeout within which the webhook
* should be called back. If there is no value specified, it takes the value
* of TimeSpan.FromMinutes(10) which is 10 minutes as default. Type: string
* (or Expression with resultType string), pattern:
* ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
*/
timeout?: any;
/**
* @member {any} [headers] Represents the headers that will be sent to the
* request. For example, to set the language and type on a request: "headers"
* : { "Accept-Language": "en-us", "Content-Type": "application/json" }.
* Type: string (or Expression with resultType string).
*/
headers?: any;
/**
* @member {any} [body] Represents the payload that will be sent to the
* endpoint. Required for POST/PUT method, not allowed for GET method Type:
* string (or Expression with resultType string).
*/
body?: any;
/**
* @member {WebActivityAuthentication} [authentication] Authentication method
* used for calling the endpoint.
*/
authentication?: WebActivityAuthentication;
}

/**
* @interface
* An interface representing ExecutePipelineActivity.
Expand Down Expand Up @@ -17153,14 +17040,6 @@ export type PolybaseSettingsRejectType = 'value' | 'percentage';
*/
export type SapCloudForCustomerSinkWriteBehavior = 'Insert' | 'Update';

/**
* Defines values for WebHookActivityMethod.
* Possible values include: 'POST'
* @readonly
* @enum {string}
*/
export type WebHookActivityMethod = 'POST';

/**
* Defines values for IntegrationRuntimeType.
* Possible values include: 'Managed', 'SelfHosted'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ export {
DependencyReference,
MultiplePipelineTrigger,
AzureFunctionLinkedService,
ResponsysLinkedService,
SecretBase,
ResponsysLinkedService,
AzureDatabricksLinkedService,
AzureDataLakeAnalyticsLinkedService,
HDInsightOnDemandLinkedService,
Expand Down Expand Up @@ -267,12 +267,10 @@ export {
SetVariableActivity,
FilterActivity,
Expression,
ValidationActivity,
UntilActivity,
WaitActivity,
ForEachActivity,
IfConditionActivity,
WebHookActivity,
ExecutePipelineActivity,
LinkedIntegrationRuntimeRbacAuthorization,
LinkedIntegrationRuntimeKeyAuthorization,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ export {
DependencyReference,
MultiplePipelineTrigger,
AzureFunctionLinkedService,
ResponsysLinkedService,
SecretBase,
ResponsysLinkedService,
AzureDatabricksLinkedService,
AzureDataLakeAnalyticsLinkedService,
HDInsightOnDemandLinkedService,
Expand Down Expand Up @@ -250,12 +250,10 @@ export {
SetVariableActivity,
FilterActivity,
Expression,
ValidationActivity,
UntilActivity,
WaitActivity,
ForEachActivity,
IfConditionActivity,
WebHookActivity,
ExecutePipelineActivity,
LinkedIntegrationRuntimeRbacAuthorization,
LinkedIntegrationRuntimeKeyAuthorization,
Expand Down
106 changes: 7 additions & 99 deletions packages/@azure/arm-datafactory/lib/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3171,7 +3171,13 @@ export const AzureFunctionLinkedService: msRest.CompositeMapper = {
functionKey: {
serializedName: "typeProperties.functionKey",
type: {
name: "Object"
name: "Composite",
polymorphicDiscriminator: {
serializedName: "type",
clientName: "type"
},
uberParent: "SecretBase",
className: "SecretBase"
}
},
encryptedCredential: {
Expand Down Expand Up @@ -13029,47 +13035,6 @@ export const FilterActivity: msRest.CompositeMapper = {
}
};

export const ValidationActivity: msRest.CompositeMapper = {
serializedName: "Validation",
type: {
name: "Composite",
polymorphicDiscriminator: Activity.type.polymorphicDiscriminator,
uberParent: "Activity",
className: "ValidationActivity",
modelProperties: {
...ControlActivity.type.modelProperties,
timeout: {
serializedName: "typeProperties.timeout",
type: {
name: "Object"
}
},
sleep: {
serializedName: "typeProperties.sleep",
type: {
name: "Number"
}
},
minimumSize: {
serializedName: "typeProperties.minimumSize",
type: {
name: "Number"
}
},
dataset: {
required: true,
serializedName: "typeProperties.dataset",
defaultValue: {},
type: {
name: "Composite",
className: "DatasetReference"
}
}
},
additionalProperties: Activity.type.additionalProperties
}
};

export const UntilActivity: msRest.CompositeMapper = {
serializedName: "Until",
type: {
Expand Down Expand Up @@ -13271,61 +13236,6 @@ export const IfConditionActivity: msRest.CompositeMapper = {
}
};

export const WebHookActivity: msRest.CompositeMapper = {
serializedName: "WebHook",
type: {
name: "Composite",
polymorphicDiscriminator: Activity.type.polymorphicDiscriminator,
uberParent: "Activity",
className: "WebHookActivity",
modelProperties: {
...ControlActivity.type.modelProperties,
method: {
required: true,
isConstant: true,
serializedName: "typeProperties.method",
defaultValue: 'POST',
type: {
name: "String"
}
},
url: {
required: true,
serializedName: "typeProperties.url",
type: {
name: "Object"
}
},
timeout: {
serializedName: "typeProperties.timeout",
type: {
name: "Object"
}
},
headers: {
serializedName: "typeProperties.headers",
type: {
name: "Object"
}
},
body: {
serializedName: "typeProperties.body",
type: {
name: "Object"
}
},
authentication: {
serializedName: "typeProperties.authentication",
type: {
name: "Composite",
className: "WebActivityAuthentication"
}
}
},
additionalProperties: Activity.type.additionalProperties
}
};

export const ExecutePipelineActivity: msRest.CompositeMapper = {
serializedName: "ExecutePipeline",
type: {
Expand Down Expand Up @@ -15058,12 +14968,10 @@ export const discriminators = {
'Activity.AppendVariable' : AppendVariableActivity,
'Activity.SetVariable' : SetVariableActivity,
'Activity.Filter' : FilterActivity,
'Activity.Validation' : ValidationActivity,
'Activity.Until' : UntilActivity,
'Activity.Wait' : WaitActivity,
'Activity.ForEach' : ForEachActivity,
'Activity.IfCondition' : IfConditionActivity,
'Activity.WebHook' : WebHookActivity,
'Activity.ExecutePipeline' : ExecutePipelineActivity,
'Activity.Container' : ControlActivity,
'IntegrationRuntimeStatus.SelfHosted' : SelfHostedIntegrationRuntimeStatus,
Expand Down
Loading