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

Support --self-contained-interactive-authoring-enabled in integration-runtime self-hosted create #7084

Merged
merged 14 commits into from
Dec 18, 2023
4 changes: 4 additions & 0 deletions src/datafactory/HISTORY.rst
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@
Release History
===============
0.11.0
+++++
* Support --enable-self-contained-interactive-authoring in integration-runtime self-hosted create

0.10.0
+++++
* Support new features in ADF
8 changes: 7 additions & 1 deletion src/datafactory/azext_datafactory/generated/_params.py
Original file line number Diff line number Diff line change
@@ -306,7 +306,13 @@ def load_arguments(self, _):
help="The base definition of a linked integration "
"runtime. Expected value: json-string/json-file/@json-file.",
arg_group="Type Properties",
)
),
c.argument(
"enableselfcontainedia",
options_list=['--enable-self-contained-interactive-authoring', '--enable-scia'],
type=str,
help="An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay.",
),

with self.argument_context("datafactory integration-runtime update") as c:
c.argument("resource_group_name", resource_group_name_type)
3 changes: 3 additions & 0 deletions src/datafactory/azext_datafactory/generated/custom.py
Original file line number Diff line number Diff line change
@@ -262,6 +262,7 @@ def datafactory_integration_runtime_self_hosted_create(
if_match=None,
description=None,
linked_info=None,
enableselfcontainedia=None,
):
integration_runtime = {}
integration_runtime["properties"] = {}
@@ -270,6 +271,8 @@ def datafactory_integration_runtime_self_hosted_create(
integration_runtime["properties"]["description"] = description
if linked_info is not None:
integration_runtime["properties"]["linked_info"] = linked_info
if enableselfcontainedia is not None:
integration_runtime["properties"]["selfContainedInteractiveAuthoringEnabled"] = enableselfcontainedia
return client.create_or_update(
resource_group_name=resource_group_name,
factory_name=factory_name,
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
from azure.cli.core.azclierror import AzCLIError, CLIInternalError, CLIError
import unittest

### Steps
# Steps


def step_dataset_update(test, checks=None):
@@ -301,7 +301,7 @@ def step_data_flow_list(self):
self.assertTrue(len(data_flow_list) == 2)


### Scenarios
# Scenarios


def call_managed_integrationruntime_scenario(test):
2 changes: 1 addition & 1 deletion src/datafactory/azext_datafactory/manual/version.py
Original file line number Diff line number Diff line change
@@ -8,4 +8,4 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "0.10.0"
VERSION = "0.11.0"
Jingshu918 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion src/datafactory/azext_datafactory/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ def import_manual_function(origin_func):
module_path = __path__[0].lower()
if not decorated_path.startswith(module_path):
raise Exception("Decorator can only be used in submodules!")
manual_path = os.path.join(decorated_path[module_path.rfind(os.path.sep) + 1 :])
manual_path = os.path.join(decorated_path[module_path.rfind(os.path.sep) + 1:])
manual_file_path, manual_file_name = os.path.split(manual_path)
module_name, _ = os.path.splitext(manual_file_name)
manual_module = "..manual." + ".".join(
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "4.0.0"
VERSION = "4.1.0"

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/datafactory/report.md
Original file line number Diff line number Diff line change
@@ -532,6 +532,7 @@ integration runtime" --name "exampleIntegrationRuntime" --resource-group "exampl
|**--if-match**|string|ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be * for unconditional update.|if_match|If-Match|
|**--description**|string|Integration runtime description.|self_hosted_description|description|
|**--linked-info**|object|The base definition of a linked integration runtime.|self_hosted_linked_info|linkedInfo|
|**--enable-self-contained-interactive-authoring**|string|An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay.|--enable_self_contained_interactive_authoring|enableSelfContainedInteractiveAuthoring|

#### <a name="IntegrationRuntimesUpdate">Command `az datafactory integration-runtime update`</a>