CodeGen from PR 15661 in Azure/azure-rest-api-specs

Merge 33cbdd7cfb3a4fd8152ef250efb600463c746bab into 6bb4782

Author: SDKAuto

src/datafactory/HISTORY.rst

@@ -3,33 +3,6 @@
 Release History
 ===============
 
-0.5.0
-+++++
-* az datafactory managed-virtual-network: Support create/update/list/show managed virtual network.
-* az datafactory managed-private-endpoint: Support create/update/list/show/delete managed private endpoint.
-
-0.4.0
-+++++
-* GA the whole module
-
-0.3.0
-+++++
-* [BREAKING CHANGE] Renamed command subgroup `az datafactory factory` to `az datafactory`.
-* [BREAKING CHANGE] `az datafactory integration-runtime managed create`: `--type-properties-compute-properties` renamed to `--compute-properties`,
-  `--type-properties-ssis-properties` renamed to `--ssis-properties`.
-* [BREAKING CHANGE] `az datafactory integration-runtime self-hosted create`: `--type-properties-linked-info` renamed to `--linked-info`.
-* [BREAKING CHANGE] `az datafactory integration-runtime update`: `--properties` renamed to `--linked-service`.
-* [BREAKING CHANGE] `az datafactory linked-service delete`: `--properties` renamed to `--dataset`.
-* [BREAKING CHANGE] `az datafactory trigger list`: `--properties` renamed to `--trigger`.
-
-0.2.1
-+++++
-* az datafactory factory create: Enable managed identity by default
-
-0.2.0
-++++++
-* add update command for linked services and triggers and datasets
-
 0.1.0
 ++++++
 * Initial release.

src/datafactory/azext_datafactory/__init__.py

@@ -7,10 +7,13 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-# pylint: disable=unused-import
 
-import azext_datafactory._help
 from azure.cli.core import AzCommandsLoader
+from azext_datafactory.generated._help import helps  # pylint: disable=unused-import
+try:
+    from azext_datafactory.manual._help import helps  # pylint: disable=reimported
+except ImportError:
+    pass
 
 
 class DataFactoryManagementClientCommandsLoader(AzCommandsLoader):
@@ -30,11 +33,8 @@ def load_command_table(self, args):
         try:
             from azext_datafactory.manual.commands import load_command_table as load_command_table_manual
             load_command_table_manual(self, args)
-        except ImportError as e:
-            if e.name.endswith('manual.commands'):
-                pass
-            else:
-                raise e
+        except ImportError:
+            pass
         return self.command_table
 
     def load_arguments(self, command):
@@ -43,11 +43,8 @@ def load_arguments(self, command):
         try:
             from azext_datafactory.manual._params import load_arguments as load_arguments_manual
             load_arguments_manual(self, command)
-        except ImportError as e:
-            if e.name.endswith('manual._params'):
-                pass
-            else:
-                raise e
+        except ImportError:
+            pass
 
 
 COMMAND_LOADER_CLS = DataFactoryManagementClientCommandsLoader

src/datafactory/azext_datafactory/_help.py

@@ -13,8 +13,5 @@
 from .generated.action import *  # noqa: F403
 try:
     from .manual.action import *  # noqa: F403
-except ImportError as e:
-    if e.name.endswith('manual.action'):
-        pass
-    else:
-        raise e
+except ImportError:
+    pass

src/datafactory/azext_datafactory/action.py

@@ -1,3 +1,4 @@
 {
+    "azext.isExperimental": true,
     "azext.minCliCoreVersion": "2.15.0"
 }

src/datafactory/azext_datafactory/azext_metadata.json

@@ -13,8 +13,5 @@
 from .generated.custom import *  # noqa: F403
 try:
     from .manual.custom import *  # noqa: F403
-except ImportError as e:
-    if e.name.endswith('manual.custom'):
-        pass
-    else:
-        raise e
+except ImportError:
+    pass

src/datafactory/azext_datafactory/custom.py

@@ -56,9 +56,13 @@ def cf_trigger_run(cli_ctx, *_):
     return cf_datafactory_cl(cli_ctx).trigger_runs
 
 
-def cf_managed_virtual_network(cli_ctx, *_):
-    return cf_datafactory_cl(cli_ctx).managed_virtual_networks
+def cf_private_end_point_connection(cli_ctx, *_):
+    return cf_datafactory_cl(cli_ctx).private_end_point_connections
 
 
-def cf_managed_private_endpoint(cli_ctx, *_):
-    return cf_datafactory_cl(cli_ctx).managed_private_endpoints
+def cf_private_endpoint_connection(cli_ctx, *_):
+    return cf_datafactory_cl(cli_ctx).private_endpoint_connection
+
+
+def cf_private_link_resource(cli_ctx, *_):
+    return cf_datafactory_cl(cli_ctx).private_link_resources