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.

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

release for mgmt datafactory 12 #12774

Merged
merged 2 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
28 changes: 28 additions & 0 deletions sdk/datafactory/azure-mgmt-datafactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Release History

## 0.12.0 (2020-07-29)

**Features**

- Model SalesforceMarketingCloudLinkedService has a new parameter connection_properties
- Model ODataLinkedService has a new parameter azure_cloud_type
- Model SapOpenHubSource has a new parameter custom_rfc_read_table_function_module
- Model SapOpenHubSource has a new parameter sap_data_column_delimiter
- Model AzureBlobStorageLinkedService has a new parameter azure_cloud_type
- Model XeroLinkedService has a new parameter connection_properties
- Model SapTableSource has a new parameter sap_data_column_delimiter
- Model AzureSqlDatabaseLinkedService has a new parameter azure_cloud_type
- Model SapOpenHubLinkedService has a new parameter logon_group
- Model SapOpenHubLinkedService has a new parameter system_id
- Model SapOpenHubLinkedService has a new parameter message_server_service
- Model SapOpenHubLinkedService has a new parameter message_server
- Model AzureSqlDWLinkedService has a new parameter azure_cloud_type
- Model AzureDataLakeStoreLinkedService has a new parameter azure_cloud_type
- Model QuickBooksLinkedService has a new parameter connection_properties
- Model RestServiceLinkedService has a new parameter azure_cloud_type
- Model AzureSqlMILinkedService has a new parameter azure_cloud_type
- Model SquareLinkedService has a new parameter connection_properties
- Model AzureBlobFSLinkedService has a new parameter azure_cloud_type
- Model AzureFileStorageLinkedService has a new parameter snapshot
- Model AzureDatabricksLinkedService has a new parameter new_cluster_log_destination
- Model ZohoLinkedService has a new parameter connection_properties
- Added operation TriggerRunsOperations.cancel

## 0.11.0 (2020-06-16)

**Features**
Expand Down
2 changes: 1 addition & 1 deletion sdk/datafactory/azure-mgmt-datafactory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is the Microsoft Azure Data Factory Management Client Library.
This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).


# Usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
from ._models_py3 import AvroSink
from ._models_py3 import AvroSource
from ._models_py3 import AvroWriteSettings
from ._models_py3 import AzPowerShellSetup
from ._models_py3 import AzureBatchLinkedService
from ._models_py3 import AzureBlobDataset
from ._models_py3 import AzureBlobFSDataset
Expand Down Expand Up @@ -443,6 +444,7 @@
from ._models_py3 import ResponsysSource
from ._models_py3 import RestResourceDataset
from ._models_py3 import RestServiceLinkedService
from ._models_py3 import RestSink
from ._models_py3 import RestSource
from ._models_py3 import RetryPolicy
from ._models_py3 import RunFilterParameters
Expand Down Expand Up @@ -631,6 +633,7 @@
from ._models import AvroSink
from ._models import AvroSource
from ._models import AvroWriteSettings
from ._models import AzPowerShellSetup
from ._models import AzureBatchLinkedService
from ._models import AzureBlobDataset
from ._models import AzureBlobFSDataset
Expand Down Expand Up @@ -1040,6 +1043,7 @@
from ._models import ResponsysSource
from ._models import RestResourceDataset
from ._models import RestServiceLinkedService
from ._models import RestSink
from ._models import RestSource
from ._models import RetryPolicy
from ._models import RunFilterParameters
Expand Down Expand Up @@ -1318,6 +1322,7 @@
'AvroSink',
'AvroSource',
'AvroWriteSettings',
'AzPowerShellSetup',
'AzureBatchLinkedService',
'AzureBlobDataset',
'AzureBlobFSDataset',
Expand Down Expand Up @@ -1727,6 +1732,7 @@
'ResponsysSource',
'RestResourceDataset',
'RestServiceLinkedService',
'RestSink',
'RestSource',
'RetryPolicy',
'RunFilterParameters',
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,65 @@ def rerun(
return client_raw_response
rerun.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/rerun'}

def cancel(
self, resource_group_name, factory_name, trigger_name, run_id, custom_headers=None, raw=False, **operation_config):
"""Cancel a single trigger instance by runId.

:param resource_group_name: The resource group name.
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
:param trigger_name: The trigger name.
:type trigger_name: str
:param run_id: The pipeline run identifier.
:type run_id: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:return: None or ClientRawResponse if raw=true
:rtype: None or ~msrest.pipeline.ClientRawResponse
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = self.cancel.metadata['url']
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'),
'triggerName': self._serialize.url("trigger_name", trigger_name, 'str', max_length=260, min_length=1, pattern=r'^[A-Za-z0-9_][^<>*#.%&:\\+?/]*$'),
'runId': self._serialize.url("run_id", run_id, 'str')
}
url = self._client.format_url(url, **path_format_arguments)

# Construct parameters
query_parameters = {}
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')

# Construct headers
header_parameters = {}
if self.config.generate_client_request_id:
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
if custom_headers:
header_parameters.update(custom_headers)
if self.config.accept_language is not None:
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')

# Construct and send request
request = self._client.post(url, query_parameters, header_parameters)
response = self._client.send(request, stream=False, **operation_config)

if response.status_code not in [200]:
exp = CloudError(response)
exp.request_id = response.headers.get('x-ms-request-id')
raise exp

if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/cancel'}

def query_by_factory(
self, resource_group_name, factory_name, filter_parameters, custom_headers=None, raw=False, **operation_config):
"""Query trigger runs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "0.11.0"
VERSION = "0.12.0"

2 changes: 1 addition & 1 deletion sdk/datafactory/azure-mgmt-datafactory/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
pass

# Version extraction inspired from 'requests'
with open(os.path.join(package_folder_path, 'version.py')
with open(os.path.join(package_folder_path, 'version.py')
if os.path.exists(os.path.join(package_folder_path, 'version.py'))
else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
Expand Down