Generated from 0d3bebe04c8ee34399f725a3581ba55cebff214f

combine and update web auth definitions

azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py

@@ -342,7 +342,6 @@
     from .wait_activity_py3 import WaitActivity
     from .for_each_activity_py3 import ForEachActivity
     from .if_condition_activity_py3 import IfConditionActivity
-    from .web_hook_activity_authentication_py3 import WebHookActivityAuthentication
     from .web_hook_activity_py3 import WebHookActivity
     from .execute_pipeline_activity_py3 import ExecutePipelineActivity
     from .control_activity_py3 import ControlActivity
@@ -704,7 +703,6 @@
     from .wait_activity import WaitActivity
     from .for_each_activity import ForEachActivity
     from .if_condition_activity import IfConditionActivity
-    from .web_hook_activity_authentication import WebHookActivityAuthentication
     from .web_hook_activity import WebHookActivity
     from .execute_pipeline_activity import ExecutePipelineActivity
     from .control_activity import ControlActivity
@@ -781,6 +779,7 @@
     SybaseAuthenticationType,
     DatasetCompressionLevel,
     JsonFormatFilePattern,
+    WebActivityAuthenticationType,
     WebActivityMethod,
     CassandraSourceReadConsistencyLevels,
     StoredProcedureParameterType,
@@ -1137,7 +1136,6 @@
     'WaitActivity',
     'ForEachActivity',
     'IfConditionActivity',
-    'WebHookActivityAuthentication',
     'WebHookActivity',
     'ExecutePipelineActivity',
     'ControlActivity',
@@ -1213,6 +1211,7 @@
     'SybaseAuthenticationType',
     'DatasetCompressionLevel',
     'JsonFormatFilePattern',
+    'WebActivityAuthenticationType',
     'WebActivityMethod',
     'CassandraSourceReadConsistencyLevels',
     'StoredProcedureParameterType',

azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py

@@ -308,6 +308,13 @@ class JsonFormatFilePattern(str, Enum):
     array_of_objects = "arrayOfObjects"
 
 
+class WebActivityAuthenticationType(str, Enum):
+
+    basic = "Basic"
+    client_certificate = "ClientCertificate"
+    msi = "MSI"
+
+
 class WebActivityMethod(str, Enum):
 
     get = "GET"

azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication.py

@@ -18,8 +18,10 @@ class WebActivityAuthentication(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param type: Required. Web activity authentication
-     (Basic/ClientCertificate/MSI)
-    :type type: str
+     (Basic/ClientCertificate/MSI). Possible values include: 'Basic',
+     'ClientCertificate', 'MSI'
+    :type type: str or
+     ~azure.mgmt.datafactory.models.WebActivityAuthenticationType
     :param pfx: Base64-encoded contents of a PFX file.
     :type pfx: ~azure.mgmt.datafactory.models.SecureString
     :param username: Web activity authentication user name for basic

azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication_py3.py

@@ -18,8 +18,10 @@ class WebActivityAuthentication(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param type: Required. Web activity authentication
-     (Basic/ClientCertificate/MSI)
-    :type type: str
+     (Basic/ClientCertificate/MSI). Possible values include: 'Basic',
+     'ClientCertificate', 'MSI'
+    :type type: str or
+     ~azure.mgmt.datafactory.models.WebActivityAuthenticationType
     :param pfx: Base64-encoded contents of a PFX file.
     :type pfx: ~azure.mgmt.datafactory.models.SecureString
     :param username: Web activity authentication user name for basic
@@ -44,7 +46,7 @@ class WebActivityAuthentication(Model):
         'resource': {'key': 'resource', 'type': 'str'},
     }
 
-    def __init__(self, *, type: str, pfx=None, username: str=None, password=None, resource: str=None, **kwargs) -> None:
+    def __init__(self, *, type, pfx=None, username: str=None, password=None, resource: str=None, **kwargs) -> None:
         super(WebActivityAuthentication, self).__init__(**kwargs)
         self.type = type
         self.pfx = pfx

azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_hook_activity.py

@@ -57,7 +57,7 @@ class WebHookActivity(ControlActivity):
     :param authentication: Authentication method used for calling the
      endpoint.
     :type authentication:
-     ~azure.mgmt.datafactory.models.WebHookActivityAuthentication
+     ~azure.mgmt.datafactory.models.WebActivityAuthentication
     """
 
     _validation = {
@@ -79,7 +79,7 @@ class WebHookActivity(ControlActivity):
         'timeout': {'key': 'typeProperties.timeout', 'type': 'object'},
         'headers': {'key': 'typeProperties.headers', 'type': 'object'},
         'body': {'key': 'typeProperties.body', 'type': 'object'},
-        'authentication': {'key': 'typeProperties.authentication', 'type': 'WebHookActivityAuthentication'},
+        'authentication': {'key': 'typeProperties.authentication', 'type': 'WebActivityAuthentication'},
     }
 
     method = "POST"

azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_hook_activity_py3.py

@@ -57,7 +57,7 @@ class WebHookActivity(ControlActivity):
     :param authentication: Authentication method used for calling the
      endpoint.
     :type authentication:
-     ~azure.mgmt.datafactory.models.WebHookActivityAuthentication
+     ~azure.mgmt.datafactory.models.WebActivityAuthentication
     """
 
     _validation = {
@@ -79,7 +79,7 @@ class WebHookActivity(ControlActivity):
         'timeout': {'key': 'typeProperties.timeout', 'type': 'object'},
         'headers': {'key': 'typeProperties.headers', 'type': 'object'},
         'body': {'key': 'typeProperties.body', 'type': 'object'},
-        'authentication': {'key': 'typeProperties.authentication', 'type': 'WebHookActivityAuthentication'},
+        'authentication': {'key': 'typeProperties.authentication', 'type': 'WebActivityAuthentication'},
     }
 
     method = "POST"