[Datafactory] Support managed virtual network and managed private endpoint

src/datafactory/HISTORY.rst

@@ -3,6 +3,11 @@
 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

src/datafactory/azext_datafactory/__init__.py

@@ -7,13 +7,10 @@
 # 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):
@@ -33,8 +30,11 @@ 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:
-            pass
+        except ImportError as e:
+            if e.name.endswith('manual.commands'):
+                pass
+            else:
+                raise e
         return self.command_table
 
     def load_arguments(self, command):
@@ -43,8 +43,11 @@ 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:
-            pass
+        except ImportError as e:
+            if e.name.endswith('manual._params'):
+                pass
+            else:
+                raise e
 
 
 COMMAND_LOADER_CLS = DataFactoryManagementClientCommandsLoader

src/datafactory/azext_datafactory/_help.py

@@ -0,0 +1,20 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wildcard-import
+# pylint: disable=unused-wildcard-import
+# pylint: disable=unused-import
+from .generated._help import helps  # pylint: disable=reimported
+try:
+    from .manual._help import helps  # pylint: disable=reimported
+except ImportError as e:
+    if e.name.endswith('manual._help'):
+        pass
+    else:
+        raise e

src/datafactory/azext_datafactory/action.py

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

src/datafactory/azext_datafactory/custom.py

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

src/datafactory/azext_datafactory/generated/_client_factory.py

@@ -54,3 +54,11 @@ def cf_trigger(cli_ctx, *_):
 
 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_managed_private_endpoint(cli_ctx, *_):
+    return cf_datafactory_cl(cli_ctx).managed_private_endpoints

src/datafactory/azext_datafactory/generated/_help.py

@@ -12,10 +12,10 @@
 from knack.help_files import helps
 
 
-helps['datafactory'] = """
+helps['datafactory'] = '''
     type: group
-    short-summary: Manage factory with datafactory
-"""
+    short-summary: Manage Data Factory
+'''
 
 helps['datafactory list'] = """
     type: command
@@ -447,11 +447,6 @@
 helps['datafactory linked-service update'] = """
     type: command
     short-summary: "Update a linked service."
-    examples:
-      - name: LinkedServices_Update
-        text: |-
-               az datafactory linked-service update --factory-name "exampleFactoryName" --description "Example \
-description" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
 """
 
 helps['datafactory linked-service delete'] = """
@@ -512,13 +507,6 @@
             Usage: --folder name=XX
 
             name: The name of the folder that this Dataset is in.
-    examples:
-      - name: Datasets_Update
-        text: |-
-               az datafactory dataset update --description "Example description" --linked-service-name \
-"{\\"type\\":\\"LinkedServiceReference\\",\\"referenceName\\":\\"exampleLinkedService\\"}" --parameters \
-"{\\"MyFileName\\":{\\"type\\":\\"String\\"},\\"MyFolderPath\\":{\\"type\\":\\"String\\"}}" --name "exampleDataset" \
---factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
 """
 
 helps['datafactory dataset delete'] = """
@@ -756,11 +744,6 @@
 helps['datafactory trigger update'] = """
     type: command
     short-summary: "Update a trigger."
-    examples:
-      - name: Triggers_Update
-        text: |-
-               az datafactory trigger update --factory-name "exampleFactoryName" --resource-group \
-"exampleResourceGroup" --description "Example description" --name "exampleTrigger"
 """
 
 helps['datafactory trigger delete'] = """
@@ -902,3 +885,97 @@
                az datafactory trigger-run rerun --factory-name "exampleFactoryName" --resource-group \
 "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
 """
+
+helps['datafactory managed-virtual-network'] = """
+    type: group
+    short-summary: Manage managed virtual network with datafactory
+"""
+
+helps['datafactory managed-virtual-network list'] = """
+    type: command
+    short-summary: "Lists managed Virtual Networks."
+    examples:
+      - name: ManagedVirtualNetworks_ListByFactory
+        text: |-
+               az datafactory managed-virtual-network list --factory-name "exampleFactoryName" --resource-group \
+"exampleResourceGroup"
+"""
+
+helps['datafactory managed-virtual-network show'] = """
+    type: command
+    short-summary: "Gets a managed Virtual Network."
+    examples:
+      - name: ManagedVirtualNetworks_Get
+        text: |-
+               az datafactory managed-virtual-network show --factory-name "exampleFactoryName" --name \
+"exampleManagedVirtualNetworkName" --resource-group "exampleResourceGroup"
+"""
+
+helps['datafactory managed-virtual-network create'] = """
+    type: command
+    short-summary: "Create a managed Virtual Network."
+    examples:
+      - name: ManagedVirtualNetworks_Create
+        text: |-
+               az datafactory managed-virtual-network create --factory-name "exampleFactoryName" --name \
+"exampleManagedVirtualNetworkName" --resource-group "exampleResourceGroup"
+"""
+
+helps['datafactory managed-virtual-network update'] = """
+    type: command
+    short-summary: "Update a managed Virtual Network."
+"""
+
+helps['datafactory managed-private-endpoint'] = """
+    type: group
+    short-summary: Manage managed private endpoint with datafactory
+"""
+
+helps['datafactory managed-private-endpoint list'] = """
+    type: command
+    short-summary: "Lists managed private endpoints."
+    examples:
+      - name: ManagedPrivateEndpoints_ListByFactory
+        text: |-
+               az datafactory managed-private-endpoint list --factory-name "exampleFactoryName" \
+--managed-virtual-network-name "exampleManagedVirtualNetworkName" --resource-group "exampleResourceGroup"
+"""
+
+helps['datafactory managed-private-endpoint show'] = """
+    type: command
+    short-summary: "Gets a managed private endpoint."
+    examples:
+      - name: ManagedPrivateEndpoints_Get
+        text: |-
+               az datafactory managed-private-endpoint show --factory-name "exampleFactoryName" --name \
+"exampleManagedPrivateEndpointName" --managed-virtual-network-name "exampleManagedVirtualNetworkName" --resource-group \
+"exampleResourceGroup"
+"""
+
+helps['datafactory managed-private-endpoint create'] = """
+    type: command
+    short-summary: "Create a managed private endpoint."
+    examples:
+      - name: ManagedPrivateEndpoints_Create
+        text: |-
+               az datafactory managed-private-endpoint create --factory-name "exampleFactoryName" --group-id "blob" \
+--private-link-resource-id "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/prov\
+iders/Microsoft.Storage/storageAccounts/exampleBlobStorage" --name "exampleManagedPrivateEndpointName" \
+--managed-virtual-network-name "exampleManagedVirtualNetworkName" --resource-group "exampleResourceGroup"
+"""
+
+helps['datafactory managed-private-endpoint update'] = """
+    type: command
+    short-summary: "Update a managed private endpoint."
+"""
+
+helps['datafactory managed-private-endpoint delete'] = """
+    type: command
+    short-summary: "Deletes a managed private endpoint."
+    examples:
+      - name: ManagedPrivateEndpoints_Delete
+        text: |-
+               az datafactory managed-private-endpoint delete --factory-name "exampleFactoryName" --name \
+"exampleManagedPrivateEndpointName" --managed-virtual-network-name "exampleManagedVirtualNetworkName" --resource-group \
+"exampleResourceGroup"
+"""