From 632d11cfc2c760a2d14e742781c26fc2d1f2bad3 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 3 Mar 2021 03:18:40 +0000 Subject: [PATCH] CodeGen from PR 13204 in Azure/azure-rest-api-specs Merge cc447302517049198915211188adcd1280ea9067 into 4d1ea13dd5ec9e9e73e8ebabfa2d27a83b7e0e0d --- .../azure/mgmt/datafactory/models/__init__.py | 2 + .../_data_factory_management_client_enums.py | 8 +++ .../azure/mgmt/datafactory/models/_models.py | 45 +++++++++++---- .../mgmt/datafactory/models/_models_py3.py | 55 +++++++++++++------ 4 files changed, 81 insertions(+), 29 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index 987622ae0455..0e0638ff37f8 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -1293,6 +1293,7 @@ from ._paged_models import PipelineResourcePaged from ._paged_models import TriggerResourcePaged from ._data_factory_management_client_enums import ( + FactoryIdentityType, GlobalParameterType, PublicNetworkAccess, IntegrationRuntimeState, @@ -2023,6 +2024,7 @@ 'DataFlowDebugSessionInfoPaged', 'ManagedVirtualNetworkResourcePaged', 'ManagedPrivateEndpointResourcePaged', + 'FactoryIdentityType', 'GlobalParameterType', 'PublicNetworkAccess', 'IntegrationRuntimeState', diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py index da122b92c18c..16e71726e5ca 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py @@ -12,6 +12,13 @@ from enum import Enum +class FactoryIdentityType(str, Enum): + + system_assigned = "SystemAssigned" + user_assigned = "UserAssigned" + system_assigned_user_assigned = "SystemAssigned,UserAssigned" + + class GlobalParameterType(str, Enum): object_enum = "Object" @@ -245,6 +252,7 @@ class SftpAuthenticationType(str, Enum): basic = "Basic" ssh_public_key = "SshPublicKey" + multi_factor = "MultiFactor" class FtpAuthenticationType(str, Enum): diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py index 42896972d1f1..b8062c1d62da 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py @@ -14195,8 +14195,9 @@ class FactoryIdentity(Model): All required parameters must be populated in order to send to Azure. - :ivar type: Required. The identity type. Default value: "SystemAssigned" . - :vartype type: str + :param type: Required. The identity type. Possible values include: + 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned' + :type type: str or ~azure.mgmt.datafactory.models.FactoryIdentityType :ivar principal_id: The principal id of the identity. :vartype principal_id: str :ivar tenant_id: The client tenant id of the identity. @@ -14207,7 +14208,7 @@ class FactoryIdentity(Model): """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'principal_id': {'readonly': True}, 'tenant_id': {'readonly': True}, } @@ -14219,10 +14220,9 @@ class FactoryIdentity(Model): 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{object}'}, } - type = "SystemAssigned" - def __init__(self, **kwargs): super(FactoryIdentity, self).__init__(**kwargs) + self.type = kwargs.get('type', None) self.principal_id = None self.tenant_id = None self.user_assigned_identities = kwargs.get('user_assigned_identities', None) @@ -17643,6 +17643,10 @@ class HttpLinkedService(LinkedService): :param password: Password for Basic, Digest, Windows, or ClientCertificate with EmbeddedCertData authentication. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param embedded_cert_data: Base64 encoded certificate data for ClientCertificate authentication. For on-premises copy with ClientCertificate authentication, either CertThumbprint or @@ -17681,6 +17685,7 @@ class HttpLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'embedded_cert_data': {'key': 'typeProperties.embeddedCertData', 'type': 'object'}, 'cert_thumbprint': {'key': 'typeProperties.certThumbprint', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, @@ -17693,6 +17698,7 @@ def __init__(self, **kwargs): self.authentication_type = kwargs.get('authentication_type', None) self.user_name = kwargs.get('user_name', None) self.password = kwargs.get('password', None) + self.auth_headers = kwargs.get('auth_headers', None) self.embedded_cert_data = kwargs.get('embedded_cert_data', None) self.cert_thumbprint = kwargs.get('cert_thumbprint', None) self.encrypted_credential = kwargs.get('encrypted_credential', None) @@ -22629,6 +22635,10 @@ class ODataLinkedService(LinkedService): :type user_name: object :param password: Password of the OData service. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param tenant: Specify the tenant information (domain name or tenant ID) under which your application resides. Type: string (or Expression with resultType string). @@ -22688,6 +22698,7 @@ class ODataLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'azure_cloud_type': {'key': 'typeProperties.azureCloudType', 'type': 'object'}, @@ -22705,6 +22716,7 @@ def __init__(self, **kwargs): self.authentication_type = kwargs.get('authentication_type', None) self.user_name = kwargs.get('user_name', None) self.password = kwargs.get('password', None) + self.auth_headers = kwargs.get('auth_headers', None) self.tenant = kwargs.get('tenant', None) self.service_principal_id = kwargs.get('service_principal_id', None) self.azure_cloud_type = kwargs.get('azure_cloud_type', None) @@ -26582,6 +26594,10 @@ class RestServiceLinkedService(LinkedService): :type user_name: object :param password: The password used in Basic authentication type. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param service_principal_id: The application's client ID used in AadServicePrincipal authentication type. :type service_principal_id: object @@ -26624,6 +26640,7 @@ class RestServiceLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, @@ -26639,6 +26656,7 @@ def __init__(self, **kwargs): self.authentication_type = kwargs.get('authentication_type', None) self.user_name = kwargs.get('user_name', None) self.password = kwargs.get('password', None) + self.auth_headers = kwargs.get('auth_headers', None) self.service_principal_id = kwargs.get('service_principal_id', None) self.service_principal_key = kwargs.get('service_principal_key', None) self.tenant = kwargs.get('tenant', None) @@ -30015,7 +30033,8 @@ class SftpServerLinkedService(LinkedService): resultType integer), minimum: 0. :type port: object :param authentication_type: The authentication type to be used to connect - to the FTP server. Possible values include: 'Basic', 'SshPublicKey' + to the FTP server. Possible values include: 'Basic', 'SshPublicKey', + 'MultiFactor' :type authentication_type: str or ~azure.mgmt.datafactory.models.SftpAuthenticationType :param user_name: The username used to log on to the SFTP server. Type: @@ -34723,14 +34742,16 @@ class WebActivityAuthentication(Model): for ServicePrincipal :type pfx: ~azure.mgmt.datafactory.models.SecretBase :param username: Web activity authentication user name for basic - authentication or ClientID when used for ServicePrincipal - :type username: str + authentication or ClientID when used for ServicePrincipal. Type: string + (or Expression with resultType string). + :type username: object :param password: Password for the PFX file or basic authentication / Secret when used for ServicePrincipal :type password: ~azure.mgmt.datafactory.models.SecretBase :param resource: Resource for which Azure Auth token will be requested - when using MSI Authentication. - :type resource: str + when using MSI Authentication. Type: string (or Expression with resultType + string). + :type resource: object :param user_tenant: TenantId for which Azure Auth token will be requested when using ServicePrincipal Authentication. Type: string (or Expression with resultType string). @@ -34744,9 +34765,9 @@ class WebActivityAuthentication(Model): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'pfx': {'key': 'pfx', 'type': 'SecretBase'}, - 'username': {'key': 'username', 'type': 'str'}, + 'username': {'key': 'username', 'type': 'object'}, 'password': {'key': 'password', 'type': 'SecretBase'}, - 'resource': {'key': 'resource', 'type': 'str'}, + 'resource': {'key': 'resource', 'type': 'object'}, 'user_tenant': {'key': 'userTenant', 'type': 'object'}, } diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index f4386d2b9084..6e771bed1bb5 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -14195,8 +14195,9 @@ class FactoryIdentity(Model): All required parameters must be populated in order to send to Azure. - :ivar type: Required. The identity type. Default value: "SystemAssigned" . - :vartype type: str + :param type: Required. The identity type. Possible values include: + 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned' + :type type: str or ~azure.mgmt.datafactory.models.FactoryIdentityType :ivar principal_id: The principal id of the identity. :vartype principal_id: str :ivar tenant_id: The client tenant id of the identity. @@ -14207,7 +14208,7 @@ class FactoryIdentity(Model): """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'principal_id': {'readonly': True}, 'tenant_id': {'readonly': True}, } @@ -14219,10 +14220,9 @@ class FactoryIdentity(Model): 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{object}'}, } - type = "SystemAssigned" - - def __init__(self, *, user_assigned_identities=None, **kwargs) -> None: + def __init__(self, *, type, user_assigned_identities=None, **kwargs) -> None: super(FactoryIdentity, self).__init__(**kwargs) + self.type = type self.principal_id = None self.tenant_id = None self.user_assigned_identities = user_assigned_identities @@ -17643,6 +17643,10 @@ class HttpLinkedService(LinkedService): :param password: Password for Basic, Digest, Windows, or ClientCertificate with EmbeddedCertData authentication. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param embedded_cert_data: Base64 encoded certificate data for ClientCertificate authentication. For on-premises copy with ClientCertificate authentication, either CertThumbprint or @@ -17681,18 +17685,20 @@ class HttpLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'embedded_cert_data': {'key': 'typeProperties.embeddedCertData', 'type': 'object'}, 'cert_thumbprint': {'key': 'typeProperties.certThumbprint', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, 'enable_server_certificate_validation': {'key': 'typeProperties.enableServerCertificateValidation', 'type': 'object'}, } - def __init__(self, *, url, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, embedded_cert_data=None, cert_thumbprint=None, encrypted_credential=None, enable_server_certificate_validation=None, **kwargs) -> None: + def __init__(self, *, url, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, auth_headers=None, embedded_cert_data=None, cert_thumbprint=None, encrypted_credential=None, enable_server_certificate_validation=None, **kwargs) -> None: super(HttpLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.url = url self.authentication_type = authentication_type self.user_name = user_name self.password = password + self.auth_headers = auth_headers self.embedded_cert_data = embedded_cert_data self.cert_thumbprint = cert_thumbprint self.encrypted_credential = encrypted_credential @@ -22629,6 +22635,10 @@ class ODataLinkedService(LinkedService): :type user_name: object :param password: Password of the OData service. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param tenant: Specify the tenant information (domain name or tenant ID) under which your application resides. Type: string (or Expression with resultType string). @@ -22688,6 +22698,7 @@ class ODataLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'azure_cloud_type': {'key': 'typeProperties.azureCloudType', 'type': 'object'}, @@ -22699,12 +22710,13 @@ class ODataLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, url, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, tenant=None, service_principal_id=None, azure_cloud_type=None, aad_resource_id=None, aad_service_principal_credential_type=None, service_principal_key=None, service_principal_embedded_cert=None, service_principal_embedded_cert_password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, url, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, auth_headers=None, tenant=None, service_principal_id=None, azure_cloud_type=None, aad_resource_id=None, aad_service_principal_credential_type=None, service_principal_key=None, service_principal_embedded_cert=None, service_principal_embedded_cert_password=None, encrypted_credential=None, **kwargs) -> None: super(ODataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.url = url self.authentication_type = authentication_type self.user_name = user_name self.password = password + self.auth_headers = auth_headers self.tenant = tenant self.service_principal_id = service_principal_id self.azure_cloud_type = azure_cloud_type @@ -26582,6 +26594,10 @@ class RestServiceLinkedService(LinkedService): :type user_name: object :param password: The password used in Basic authentication type. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param auth_headers: The additional HTTP headers in the request to RESTful + API used for authorization. Type: object (or Expression with resultType + object). + :type auth_headers: object :param service_principal_id: The application's client ID used in AadServicePrincipal authentication type. :type service_principal_id: object @@ -26624,6 +26640,7 @@ class RestServiceLinkedService(LinkedService): 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'auth_headers': {'key': 'typeProperties.authHeaders', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, @@ -26632,13 +26649,14 @@ class RestServiceLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, url, authentication_type, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, enable_server_certificate_validation=None, user_name=None, password=None, service_principal_id=None, service_principal_key=None, tenant=None, azure_cloud_type=None, aad_resource_id=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, url, authentication_type, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, enable_server_certificate_validation=None, user_name=None, password=None, auth_headers=None, service_principal_id=None, service_principal_key=None, tenant=None, azure_cloud_type=None, aad_resource_id=None, encrypted_credential=None, **kwargs) -> None: super(RestServiceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.url = url self.enable_server_certificate_validation = enable_server_certificate_validation self.authentication_type = authentication_type self.user_name = user_name self.password = password + self.auth_headers = auth_headers self.service_principal_id = service_principal_id self.service_principal_key = service_principal_key self.tenant = tenant @@ -30015,7 +30033,8 @@ class SftpServerLinkedService(LinkedService): resultType integer), minimum: 0. :type port: object :param authentication_type: The authentication type to be used to connect - to the FTP server. Possible values include: 'Basic', 'SshPublicKey' + to the FTP server. Possible values include: 'Basic', 'SshPublicKey', + 'MultiFactor' :type authentication_type: str or ~azure.mgmt.datafactory.models.SftpAuthenticationType :param user_name: The username used to log on to the SFTP server. Type: @@ -34723,14 +34742,16 @@ class WebActivityAuthentication(Model): for ServicePrincipal :type pfx: ~azure.mgmt.datafactory.models.SecretBase :param username: Web activity authentication user name for basic - authentication or ClientID when used for ServicePrincipal - :type username: str + authentication or ClientID when used for ServicePrincipal. Type: string + (or Expression with resultType string). + :type username: object :param password: Password for the PFX file or basic authentication / Secret when used for ServicePrincipal :type password: ~azure.mgmt.datafactory.models.SecretBase :param resource: Resource for which Azure Auth token will be requested - when using MSI Authentication. - :type resource: str + when using MSI Authentication. Type: string (or Expression with resultType + string). + :type resource: object :param user_tenant: TenantId for which Azure Auth token will be requested when using ServicePrincipal Authentication. Type: string (or Expression with resultType string). @@ -34744,13 +34765,13 @@ class WebActivityAuthentication(Model): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'pfx': {'key': 'pfx', 'type': 'SecretBase'}, - 'username': {'key': 'username', 'type': 'str'}, + 'username': {'key': 'username', 'type': 'object'}, 'password': {'key': 'password', 'type': 'SecretBase'}, - 'resource': {'key': 'resource', 'type': 'str'}, + 'resource': {'key': 'resource', 'type': 'object'}, 'user_tenant': {'key': 'userTenant', 'type': 'object'}, } - def __init__(self, *, type: str, pfx=None, username: str=None, password=None, resource: str=None, user_tenant=None, **kwargs) -> None: + def __init__(self, *, type: str, pfx=None, username=None, password=None, resource=None, user_tenant=None, **kwargs) -> None: super(WebActivityAuthentication, self).__init__(**kwargs) self.type = type self.pfx = pfx