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 datafactory/resource-manager] [Azure Data Factory] Change Ssis activity property type to support expression #4090

Merged
merged 1 commit into from
Jan 3, 2019
Merged

[AutoPR datafactory/resource-manager] [Azure Data Factory] Change Ssis activity property type to support expression #4090

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: 0 additions & 2 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,6 @@
CassandraSourceReadConsistencyLevels,
StoredProcedureParameterType,
SalesforceSourceReadBehavior,
SSISExecutionRuntime,
HDInsightActivityDebugInfoOption,
SalesforceSinkWriteBehavior,
AzureSearchIndexWriteBehaviorType,
Expand Down Expand Up @@ -1211,7 +1210,6 @@
'CassandraSourceReadConsistencyLevels',
'StoredProcedureParameterType',
'SalesforceSourceReadBehavior',
'SSISExecutionRuntime',
'HDInsightActivityDebugInfoOption',
'SalesforceSinkWriteBehavior',
'AzureSearchIndexWriteBehaviorType',
Expand Down
6 changes: 0 additions & 6 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,6 @@ class SalesforceSourceReadBehavior(str, Enum):
query_all = "QueryAll"


class SSISExecutionRuntime(str, Enum):

x64 = "x64"
x86 = "x86"


class HDInsightActivityDebugInfoOption(str, Enum):

none = "None"
Expand Down
21 changes: 12 additions & 9 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ class ExecuteSSISPackageActivity(ExecutionActivity):
:type policy: ~azure.mgmt.datafactory.models.ActivityPolicy
:param package_location: Required. SSIS package location.
:type package_location: ~azure.mgmt.datafactory.models.SSISPackageLocation
:param runtime: Specifies the runtime to execute SSIS package. Possible
values include: 'x64', 'x86'
:type runtime: str or ~azure.mgmt.datafactory.models.SSISExecutionRuntime
:param logging_level: The logging level of SSIS package execution.
:type logging_level: str
:param runtime: Specifies the runtime to execute SSIS package. The value
should be "x86" or "x64". Type: string (or Expression with resultType
string).
:type runtime: object
:param logging_level: The logging level of SSIS package execution. Type:
string (or Expression with resultType string).
:type logging_level: object
:param environment_path: The environment path to execute the SSIS package.
:type environment_path: str
Type: string (or Expression with resultType string).
:type environment_path: object
:param connect_via: Required. The integration runtime reference.
:type connect_via:
~azure.mgmt.datafactory.models.IntegrationRuntimeReference
Expand Down Expand Up @@ -86,9 +89,9 @@ class ExecuteSSISPackageActivity(ExecutionActivity):
'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
'policy': {'key': 'policy', 'type': 'ActivityPolicy'},
'package_location': {'key': 'typeProperties.packageLocation', 'type': 'SSISPackageLocation'},
'runtime': {'key': 'typeProperties.runtime', 'type': 'str'},
'logging_level': {'key': 'typeProperties.loggingLevel', 'type': 'str'},
'environment_path': {'key': 'typeProperties.environmentPath', 'type': 'str'},
'runtime': {'key': 'typeProperties.runtime', 'type': 'object'},
'logging_level': {'key': 'typeProperties.loggingLevel', 'type': 'object'},
'environment_path': {'key': 'typeProperties.environmentPath', 'type': 'object'},
'connect_via': {'key': 'typeProperties.connectVia', 'type': 'IntegrationRuntimeReference'},
'project_parameters': {'key': 'typeProperties.projectParameters', 'type': '{SSISExecutionParameter}'},
'package_parameters': {'key': 'typeProperties.packageParameters', 'type': '{SSISExecutionParameter}'},
Expand Down
23 changes: 13 additions & 10 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ class ExecuteSSISPackageActivity(ExecutionActivity):
:type policy: ~azure.mgmt.datafactory.models.ActivityPolicy
:param package_location: Required. SSIS package location.
:type package_location: ~azure.mgmt.datafactory.models.SSISPackageLocation
:param runtime: Specifies the runtime to execute SSIS package. Possible
values include: 'x64', 'x86'
:type runtime: str or ~azure.mgmt.datafactory.models.SSISExecutionRuntime
:param logging_level: The logging level of SSIS package execution.
:type logging_level: str
:param runtime: Specifies the runtime to execute SSIS package. The value
should be "x86" or "x64". Type: string (or Expression with resultType
string).
:type runtime: object
:param logging_level: The logging level of SSIS package execution. Type:
string (or Expression with resultType string).
:type logging_level: object
:param environment_path: The environment path to execute the SSIS package.
:type environment_path: str
Type: string (or Expression with resultType string).
:type environment_path: object
:param connect_via: Required. The integration runtime reference.
:type connect_via:
~azure.mgmt.datafactory.models.IntegrationRuntimeReference
Expand Down Expand Up @@ -86,9 +89,9 @@ class ExecuteSSISPackageActivity(ExecutionActivity):
'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
'policy': {'key': 'policy', 'type': 'ActivityPolicy'},
'package_location': {'key': 'typeProperties.packageLocation', 'type': 'SSISPackageLocation'},
'runtime': {'key': 'typeProperties.runtime', 'type': 'str'},
'logging_level': {'key': 'typeProperties.loggingLevel', 'type': 'str'},
'environment_path': {'key': 'typeProperties.environmentPath', 'type': 'str'},
'runtime': {'key': 'typeProperties.runtime', 'type': 'object'},
'logging_level': {'key': 'typeProperties.loggingLevel', 'type': 'object'},
'environment_path': {'key': 'typeProperties.environmentPath', 'type': 'object'},
'connect_via': {'key': 'typeProperties.connectVia', 'type': 'IntegrationRuntimeReference'},
'project_parameters': {'key': 'typeProperties.projectParameters', 'type': '{SSISExecutionParameter}'},
'package_parameters': {'key': 'typeProperties.packageParameters', 'type': '{SSISExecutionParameter}'},
Expand All @@ -97,7 +100,7 @@ class ExecuteSSISPackageActivity(ExecutionActivity):
'property_overrides': {'key': 'typeProperties.propertyOverrides', 'type': '{SSISPropertyOverride}'},
}

def __init__(self, *, name: str, package_location, connect_via, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, runtime=None, logging_level: str=None, environment_path: str=None, project_parameters=None, package_parameters=None, project_connection_managers=None, package_connection_managers=None, property_overrides=None, **kwargs) -> None:
def __init__(self, *, name: str, package_location, connect_via, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, runtime=None, logging_level=None, environment_path=None, project_parameters=None, package_parameters=None, project_connection_managers=None, package_connection_managers=None, property_overrides=None, **kwargs) -> None:
super(ExecuteSSISPackageActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs)
self.package_location = package_location
self.runtime = runtime
Expand Down
7 changes: 4 additions & 3 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/ssis_package_location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ class SSISPackageLocation(Model):

All required parameters must be populated in order to send to Azure.

:param package_path: Required. The SSIS package path.
:type package_path: str
:param package_path: Required. The SSIS package path. Type: string (or
Expression with resultType string).
:type package_path: object
"""

_validation = {
'package_path': {'required': True},
}

_attribute_map = {
'package_path': {'key': 'packagePath', 'type': 'str'},
'package_path': {'key': 'packagePath', 'type': 'object'},
}

def __init__(self, **kwargs):
Expand Down
9 changes: 5 additions & 4 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/ssis_package_location_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ class SSISPackageLocation(Model):

All required parameters must be populated in order to send to Azure.

:param package_path: Required. The SSIS package path.
:type package_path: str
:param package_path: Required. The SSIS package path. Type: string (or
Expression with resultType string).
:type package_path: object
"""

_validation = {
'package_path': {'required': True},
}

_attribute_map = {
'package_path': {'key': 'packagePath', 'type': 'str'},
'package_path': {'key': 'packagePath', 'type': 'object'},
}

def __init__(self, *, package_path: str, **kwargs) -> None:
def __init__(self, *, package_path, **kwargs) -> None:
super(SSISPackageLocation, self).__init__(**kwargs)
self.package_path = package_path