[ReleasePR datafactory] [DataFactory] Add support for more frequency types for TumblingWindowTrigger

src/datafactory/HISTORY.rst

@@ -3,10 +3,6 @@
 Release History
 ===============
 
-0.2.0
-++++++
-* add update command for linked services and triggers and datasets
-
 0.1.0
 ++++++
 * Initial release.

src/datafactory/azext_datafactory/generated/_params.py

@@ -57,6 +57,8 @@ def load_arguments(self, _):
                    'GitHub repo information.', arg_group='RepoConfiguration')
         c.argument('global_parameters', type=validate_file_or_dict, help='List of parameters for factory. Expected '
                    'value: json-string/@json-file.')
+        c.argument('public_network_access', arg_type=get_enum_type(['Enabled', 'Disabled']), help='Whether or not '
+                   'public network access is allowed for the data factory.')
 
     with self.argument_context('datafactory factory update') as c:
         c.argument('resource_group_name', resource_group_name_type)

src/datafactory/azext_datafactory/generated/custom.py

@@ -39,7 +39,8 @@ def datafactory_factory_create(client,
                                tags=None,
                                factory_vsts_configuration=None,
                                factory_git_hub_configuration=None,
-                               global_parameters=None):
+                               global_parameters=None,
+                               public_network_access=None):
     all_repo_configuration = []
     if factory_vsts_configuration is not None:
         all_repo_configuration.append(factory_vsts_configuration)
@@ -56,7 +57,8 @@ def datafactory_factory_create(client,
                                    tags=tags,
                                    identity=None,
                                    repo_configuration=repo_configuration,
-                                   global_parameters=global_parameters)
+                                   global_parameters=global_parameters,
+                                   public_network_access=public_network_access)
 
 
 def datafactory_factory_update(client,
@@ -66,7 +68,7 @@ def datafactory_factory_update(client,
     return client.update(resource_group_name=resource_group_name,
                          factory_name=factory_name,
                          tags=tags,
-                         identity={"type": "SystemAssigned"})
+                         identity=json.loads("{\"type\": \"SystemAssigned\"}"))
 
 
 def datafactory_factory_delete(client,

src/datafactory/azext_datafactory/tests/latest/test_datafactory_scenario.py

@@ -17,6 +17,7 @@
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
 
 
+# Env setup
 @try_manual
 def setup(test, rg):
     pass
@@ -671,11 +672,13 @@ def step_factories_delete(test, rg):
              checks=[])
 
 
+# Env cleanup
 @try_manual
 def cleanup(test, rg):
     pass
 
 
+# Testcase
 @try_manual
 def call_scenario(test, rg):
     setup(test, rg)

src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/operations_async/_factory_operations_async.py

@@ -5,7 +5,7 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union
 import warnings
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -246,6 +246,7 @@ async def create_or_update(
         identity: Optional["models.FactoryIdentity"] = None,
         repo_configuration: Optional["models.FactoryRepoConfiguration"] = None,
         global_parameters: Optional[Dict[str, "models.GlobalParameterSpecification"]] = None,
+        public_network_access: Optional[Union[str, "models.PublicNetworkAccess"]] = None,
         **kwargs
     ) -> "models.Factory":
         """Creates or updates a factory.
@@ -267,6 +268,9 @@ async def create_or_update(
         :type repo_configuration: ~data_factory_management_client.models.FactoryRepoConfiguration
         :param global_parameters: List of parameters for factory.
         :type global_parameters: dict[str, ~data_factory_management_client.models.GlobalParameterSpecification]
+        :param public_network_access: Whether or not public network access is allowed for the data
+         factory.
+        :type public_network_access: str or ~data_factory_management_client.models.PublicNetworkAccess
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: Factory, or the result of cls(response)
         :rtype: ~data_factory_management_client.models.Factory
@@ -276,7 +280,7 @@ async def create_or_update(
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
 
-        factory = models.Factory(location=location, tags=tags, identity=identity, repo_configuration=repo_configuration, global_parameters=global_parameters)
+        factory = models.Factory(location=location, tags=tags, identity=identity, repo_configuration=repo_configuration, global_parameters=global_parameters, public_network_access=public_network_access)
         api_version = "2018-06-01"
         content_type = kwargs.pop("content_type", "application/json")