Skip to content
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

[AutoPR track2_azure-mgmt-datafactory] [Hub Generated] Publish private branch 'datafactory/v-jinpan/Script' #1820

Closed
wants to merge 1 commit into from
Closed

[AutoPR track2_azure-mgmt-datafactory] [Hub Generated] Publish private branch 'datafactory/v-jinpan/Script' #1820

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
4 changes: 2 additions & 2 deletions sdk/datafactory/azure-mgmt-datafactory/_meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "021e5ab6ec840d651d32a2c6bdf832800cdf8eb6",
"commit": "8aea7599a4b77967eff7d6f26af5bd6979467467",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"use": [
"@autorest/[email protected]",
"@autorest/[email protected]"
],
"autorest_command": "autorest specification/datafactory/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
"autorest_command": "autorest specification/datafactory/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
"readme": "specification/datafactory/resource-manager/readme.md"
}
2 changes: 1 addition & 1 deletion sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "2.9.0"
VERSION = "1.0.0"
13 changes: 12 additions & 1 deletion sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52917,7 +52917,7 @@ def __init__(self, *, name: str, uri: str, roles: JSON, parameters: Optional[str
self.parameters = parameters


class ScriptActivity(ExecutionActivity):
class ScriptActivity(ExecutionActivity): # pylint: disable=too-many-instance-attributes
"""Script activity type.

All required parameters must be populated in order to send to Azure.
Expand All @@ -52939,6 +52939,10 @@ class ScriptActivity(ExecutionActivity):
:vartype linked_service_name: ~azure.mgmt.datafactory.models.LinkedServiceReference
:ivar policy: Activity policy.
:vartype policy: ~azure.mgmt.datafactory.models.ActivityPolicy
:ivar script_block_execution_timeout: ScriptBlock execution timeout. Type: string (or
Expression with resultType string), pattern:
((\d+).)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
:vartype script_block_execution_timeout: JSON
:ivar scripts: Array of script blocks. Type: array.
:vartype scripts: list[~azure.mgmt.datafactory.models.ScriptActivityScriptBlock]
:ivar log_settings: Log settings of script activity.
Expand All @@ -52959,6 +52963,7 @@ class ScriptActivity(ExecutionActivity):
"user_properties": {"key": "userProperties", "type": "[UserProperty]"},
"linked_service_name": {"key": "linkedServiceName", "type": "LinkedServiceReference"},
"policy": {"key": "policy", "type": "ActivityPolicy"},
"script_block_execution_timeout": {"key": "typeProperties.scriptBlockExecutionTimeout", "type": "object"},
"scripts": {"key": "typeProperties.scripts", "type": "[ScriptActivityScriptBlock]"},
"log_settings": {"key": "typeProperties.logSettings", "type": "ScriptActivityTypePropertiesLogSettings"},
}
Expand All @@ -52973,6 +52978,7 @@ def __init__(
user_properties: Optional[List["_models.UserProperty"]] = None,
linked_service_name: Optional["_models.LinkedServiceReference"] = None,
policy: Optional["_models.ActivityPolicy"] = None,
script_block_execution_timeout: Optional[JSON] = None,
scripts: Optional[List["_models.ScriptActivityScriptBlock"]] = None,
log_settings: Optional["_models.ScriptActivityTypePropertiesLogSettings"] = None,
**kwargs
Expand All @@ -52993,6 +52999,10 @@ def __init__(
:paramtype linked_service_name: ~azure.mgmt.datafactory.models.LinkedServiceReference
:keyword policy: Activity policy.
:paramtype policy: ~azure.mgmt.datafactory.models.ActivityPolicy
:keyword script_block_execution_timeout: ScriptBlock execution timeout. Type: string (or
Expression with resultType string), pattern:
((\d+).)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
:paramtype script_block_execution_timeout: JSON
:keyword scripts: Array of script blocks. Type: array.
:paramtype scripts: list[~azure.mgmt.datafactory.models.ScriptActivityScriptBlock]
:keyword log_settings: Log settings of script activity.
Expand All @@ -53009,6 +53019,7 @@ def __init__(
**kwargs
)
self.type = "Script" # type: str
self.script_block_execution_timeout = script_block_execution_timeout
self.scripts = scripts
self.log_settings = log_settings

Expand Down