diff --git a/sdk/datafactory/azure-mgmt-datafactory/_meta.json b/sdk/datafactory/azure-mgmt-datafactory/_meta.json index d87d383e6363e..37e001c25eb2b 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/_meta.json +++ b/sdk/datafactory/azure-mgmt-datafactory/_meta.json @@ -4,8 +4,8 @@ "@autorest/python@5.12.0", "@autorest/modelerfour@4.19.3" ], - "commit": "291dc1769270252821f53a9590d185dae8dc5775", + "commit": "29398c40ed5232523fa4af1c56c8a929ed9b37cd", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", + "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", "readme": "specification/datafactory/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py index 6398307550c1d..c47f66669f1bf 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.3.0" +VERSION = "1.0.0" 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 07464d7d9f68e..c460442d6b930 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 @@ -717,8 +717,10 @@ CopyBehaviorType, CosmosDbConnectionMode, CosmosDbServicePrincipalCredentialType, + CredentialReferenceType, DataFlowComputeType, DataFlowDebugCommandType, + DataFlowReferenceType, DatasetCompressionLevel, DayOfWeek, DaysOfWeek, @@ -754,6 +756,7 @@ JsonFormatFilePattern, JsonWriteFilePattern, ManagedIntegrationRuntimeNodeStatus, + ManagedVirtualNetworkReferenceType, MongoDbAuthenticationType, NetezzaPartitionOption, ODataAadServicePrincipalCredentialType, @@ -800,6 +803,7 @@ TeamDeskAuthenticationType, TeradataAuthenticationType, TeradataPartitionOption, + TriggerReferenceType, TriggerRunStatus, TriggerRuntimeState, TumblingWindowFrequency, @@ -1519,8 +1523,10 @@ 'CopyBehaviorType', 'CosmosDbConnectionMode', 'CosmosDbServicePrincipalCredentialType', + 'CredentialReferenceType', 'DataFlowComputeType', 'DataFlowDebugCommandType', + 'DataFlowReferenceType', 'DatasetCompressionLevel', 'DayOfWeek', 'DaysOfWeek', @@ -1556,6 +1562,7 @@ 'JsonFormatFilePattern', 'JsonWriteFilePattern', 'ManagedIntegrationRuntimeNodeStatus', + 'ManagedVirtualNetworkReferenceType', 'MongoDbAuthenticationType', 'NetezzaPartitionOption', 'ODataAadServicePrincipalCredentialType', @@ -1602,6 +1609,7 @@ 'TeamDeskAuthenticationType', 'TeradataAuthenticationType', 'TeradataPartitionOption', + 'TriggerReferenceType', 'TriggerRunStatus', 'TriggerRuntimeState', 'TumblingWindowFrequency', 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 e9fc3a46f1846..554cca2051f0b 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 @@ -107,6 +107,12 @@ class CosmosDbServicePrincipalCredentialType(with_metaclass(CaseInsensitiveEnumM SERVICE_PRINCIPAL_KEY = "ServicePrincipalKey" SERVICE_PRINCIPAL_CERT = "ServicePrincipalCert" +class CredentialReferenceType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Credential reference type. + """ + + CREDENTIAL_REFERENCE = "CredentialReference" + class DataFlowComputeType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """Compute type of the cluster which will execute data flow job. """ @@ -123,6 +129,12 @@ class DataFlowDebugCommandType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum EXECUTE_STATISTICS_QUERY = "executeStatisticsQuery" EXECUTE_EXPRESSION_QUERY = "executeExpressionQuery" +class DataFlowReferenceType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Data flow reference type. + """ + + DATA_FLOW_REFERENCE = "DataFlowReference" + class DatasetCompressionLevel(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """All available compression levels. """ @@ -412,6 +424,12 @@ class ManagedIntegrationRuntimeNodeStatus(with_metaclass(CaseInsensitiveEnumMeta RECYCLING = "Recycling" UNAVAILABLE = "Unavailable" +class ManagedVirtualNetworkReferenceType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Managed Virtual Network reference type. + """ + + MANAGED_VIRTUAL_NETWORK_REFERENCE = "ManagedVirtualNetworkReference" + class MongoDbAuthenticationType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """The authentication type to be used to connect to the MongoDB database. """ @@ -816,6 +834,12 @@ class TeradataPartitionOption(with_metaclass(CaseInsensitiveEnumMeta, str, Enum) HASH = "Hash" DYNAMIC_RANGE = "DynamicRange" +class TriggerReferenceType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """Trigger reference type. + """ + + TRIGGER_REFERENCE = "TriggerReference" + class TriggerRunStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """Trigger run status. """ 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 f92407c06e0f0..037d5000093aa 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 @@ -16261,21 +16261,20 @@ def __init__( class CredentialReference(msrest.serialization.Model): """Credential reference type. - Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. :ivar additional_properties: Unmatched properties from the message are deserialized to this collection. :vartype additional_properties: dict[str, any] - :ivar type: Credential reference type. Has constant value: "CredentialReference". - :vartype type: str + :ivar type: Required. Credential reference type. Possible values include: + "CredentialReference". + :vartype type: str or ~azure.mgmt.datafactory.models.CredentialReferenceType :ivar reference_name: Required. Reference credential name. :vartype reference_name: str """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'reference_name': {'required': True}, } @@ -16285,11 +16284,10 @@ class CredentialReference(msrest.serialization.Model): 'reference_name': {'key': 'referenceName', 'type': 'str'}, } - type = "CredentialReference" - def __init__( self, *, + type: Union[str, "CredentialReferenceType"], reference_name: str, additional_properties: Optional[Dict[str, Any]] = None, **kwargs @@ -16298,11 +16296,15 @@ def __init__( :keyword additional_properties: Unmatched properties from the message are deserialized to this collection. :paramtype additional_properties: dict[str, any] + :keyword type: Required. Credential reference type. Possible values include: + "CredentialReference". + :paramtype type: str or ~azure.mgmt.datafactory.models.CredentialReferenceType :keyword reference_name: Required. Reference credential name. :paramtype reference_name: str """ super(CredentialReference, self).__init__(**kwargs) self.additional_properties = additional_properties + self.type = type self.reference_name = reference_name @@ -17636,15 +17638,13 @@ def __init__( class DataFlowReference(msrest.serialization.Model): """Data flow reference type. - Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. :ivar additional_properties: Unmatched properties from the message are deserialized to this collection. :vartype additional_properties: dict[str, any] - :ivar type: Data flow reference type. Has constant value: "DataFlowReference". - :vartype type: str + :ivar type: Required. Data flow reference type. Possible values include: "DataFlowReference". + :vartype type: str or ~azure.mgmt.datafactory.models.DataFlowReferenceType :ivar reference_name: Required. Reference data flow name. :vartype reference_name: str :ivar dataset_parameters: Reference data flow parameters from dataset. @@ -17654,7 +17654,7 @@ class DataFlowReference(msrest.serialization.Model): """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'reference_name': {'required': True}, } @@ -17666,11 +17666,10 @@ class DataFlowReference(msrest.serialization.Model): 'parameters': {'key': 'parameters', 'type': '{object}'}, } - type = "DataFlowReference" - def __init__( self, *, + type: Union[str, "DataFlowReferenceType"], reference_name: str, additional_properties: Optional[Dict[str, Any]] = None, dataset_parameters: Optional[Any] = None, @@ -17681,6 +17680,9 @@ def __init__( :keyword additional_properties: Unmatched properties from the message are deserialized to this collection. :paramtype additional_properties: dict[str, any] + :keyword type: Required. Data flow reference type. Possible values include: + "DataFlowReference". + :paramtype type: str or ~azure.mgmt.datafactory.models.DataFlowReferenceType :keyword reference_name: Required. Reference data flow name. :paramtype reference_name: str :keyword dataset_parameters: Reference data flow parameters from dataset. @@ -17690,6 +17692,7 @@ def __init__( """ super(DataFlowReference, self).__init__(**kwargs) self.additional_properties = additional_properties + self.type = type self.reference_name = reference_name self.dataset_parameters = dataset_parameters self.parameters = parameters @@ -21149,7 +21152,7 @@ class DynamicsLinkedService(LinkedService): :ivar service_principal_credential_type: The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string). - :vartype service_principal_credential_type: str + :vartype service_principal_credential_type: any :ivar service_principal_credential: The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If @@ -21186,7 +21189,7 @@ class DynamicsLinkedService(LinkedService): 'username': {'key': 'typeProperties.username', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, - 'service_principal_credential_type': {'key': 'typeProperties.servicePrincipalCredentialType', 'type': 'str'}, + 'service_principal_credential_type': {'key': 'typeProperties.servicePrincipalCredentialType', 'type': 'object'}, 'service_principal_credential': {'key': 'typeProperties.servicePrincipalCredential', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, 'credential': {'key': 'typeProperties.credential', 'type': 'CredentialReference'}, @@ -21209,7 +21212,7 @@ def __init__( username: Optional[Any] = None, password: Optional["SecretBase"] = None, service_principal_id: Optional[Any] = None, - service_principal_credential_type: Optional[str] = None, + service_principal_credential_type: Optional[Any] = None, service_principal_credential: Optional["SecretBase"] = None, encrypted_credential: Optional[Any] = None, credential: Optional["CredentialReference"] = None, @@ -21261,7 +21264,7 @@ def __init__( :keyword service_principal_credential_type: The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string). - :paramtype service_principal_credential_type: str + :paramtype service_principal_credential_type: any :keyword service_principal_credential: The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If @@ -34251,19 +34254,17 @@ def __init__( class ManagedVirtualNetworkReference(msrest.serialization.Model): """Managed Virtual Network reference type. - Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - :ivar type: Managed Virtual Network reference type. Has constant value: + :ivar type: Required. Managed Virtual Network reference type. Possible values include: "ManagedVirtualNetworkReference". - :vartype type: str + :vartype type: str or ~azure.mgmt.datafactory.models.ManagedVirtualNetworkReferenceType :ivar reference_name: Required. Reference ManagedVirtualNetwork name. :vartype reference_name: str """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'reference_name': {'required': True}, } @@ -34272,19 +34273,22 @@ class ManagedVirtualNetworkReference(msrest.serialization.Model): 'reference_name': {'key': 'referenceName', 'type': 'str'}, } - type = "ManagedVirtualNetworkReference" - def __init__( self, *, + type: Union[str, "ManagedVirtualNetworkReferenceType"], reference_name: str, **kwargs ): """ + :keyword type: Required. Managed Virtual Network reference type. Possible values include: + "ManagedVirtualNetworkReference". + :paramtype type: str or ~azure.mgmt.datafactory.models.ManagedVirtualNetworkReferenceType :keyword reference_name: Required. Reference ManagedVirtualNetwork name. :paramtype reference_name: str """ super(ManagedVirtualNetworkReference, self).__init__(**kwargs) + self.type = type self.reference_name = reference_name @@ -48689,7 +48693,7 @@ class ScriptAction(msrest.serialization.Model): :ivar uri: Required. The URI for the script action. :vartype uri: str :ivar roles: Required. The node types on which the script action should be executed. - :vartype roles: str + :vartype roles: any :ivar parameters: The parameters for the script action. :vartype parameters: str """ @@ -48703,7 +48707,7 @@ class ScriptAction(msrest.serialization.Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'uri': {'key': 'uri', 'type': 'str'}, - 'roles': {'key': 'roles', 'type': 'str'}, + 'roles': {'key': 'roles', 'type': 'object'}, 'parameters': {'key': 'parameters', 'type': 'str'}, } @@ -48712,7 +48716,7 @@ def __init__( *, name: str, uri: str, - roles: str, + roles: Any, parameters: Optional[str] = None, **kwargs ): @@ -48722,7 +48726,7 @@ def __init__( :keyword uri: Required. The URI for the script action. :paramtype uri: str :keyword roles: Required. The node types on which the script action should be executed. - :paramtype roles: str + :paramtype roles: any :keyword parameters: The parameters for the script action. :paramtype parameters: str """ @@ -53082,8 +53086,7 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): :vartype stored_procedure_name: any :ivar stored_procedure_parameters: Value and type setting for stored procedure parameters. Example: "{Parameter1: {value: "1", type: "int"}}". - :vartype stored_procedure_parameters: dict[str, - ~azure.mgmt.datafactory.models.StoredProcedureParameter] + :vartype stored_procedure_parameters: any """ _validation = { @@ -53102,7 +53105,7 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, 'stored_procedure_name': {'key': 'typeProperties.storedProcedureName', 'type': 'object'}, - 'stored_procedure_parameters': {'key': 'typeProperties.storedProcedureParameters', 'type': '{StoredProcedureParameter}'}, + 'stored_procedure_parameters': {'key': 'typeProperties.storedProcedureParameters', 'type': 'object'}, } def __init__( @@ -53116,7 +53119,7 @@ def __init__( user_properties: Optional[List["UserProperty"]] = None, linked_service_name: Optional["LinkedServiceReference"] = None, policy: Optional["ActivityPolicy"] = None, - stored_procedure_parameters: Optional[Dict[str, "StoredProcedureParameter"]] = None, + stored_procedure_parameters: Optional[Any] = None, **kwargs ): """ @@ -53140,8 +53143,7 @@ def __init__( :paramtype stored_procedure_name: any :keyword stored_procedure_parameters: Value and type setting for stored procedure parameters. Example: "{Parameter1: {value: "1", type: "int"}}". - :paramtype stored_procedure_parameters: dict[str, - ~azure.mgmt.datafactory.models.StoredProcedureParameter] + :paramtype stored_procedure_parameters: any """ super(SqlServerStoredProcedureActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.type = 'SqlServerStoredProcedure' # type: str @@ -56457,18 +56459,16 @@ def __init__( class TriggerReference(msrest.serialization.Model): """Trigger reference type. - Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - :ivar type: Trigger reference type. Has constant value: "TriggerReference". - :vartype type: str + :ivar type: Required. Trigger reference type. Possible values include: "TriggerReference". + :vartype type: str or ~azure.mgmt.datafactory.models.TriggerReferenceType :ivar reference_name: Required. Reference trigger name. :vartype reference_name: str """ _validation = { - 'type': {'required': True, 'constant': True}, + 'type': {'required': True}, 'reference_name': {'required': True}, } @@ -56477,19 +56477,21 @@ class TriggerReference(msrest.serialization.Model): 'reference_name': {'key': 'referenceName', 'type': 'str'}, } - type = "TriggerReference" - def __init__( self, *, + type: Union[str, "TriggerReferenceType"], reference_name: str, **kwargs ): """ + :keyword type: Required. Trigger reference type. Possible values include: "TriggerReference". + :paramtype type: str or ~azure.mgmt.datafactory.models.TriggerReferenceType :keyword reference_name: Required. Reference trigger name. :paramtype reference_name: str """ super(TriggerReference, self).__init__(**kwargs) + self.type = type self.reference_name = reference_name @@ -57778,6 +57780,8 @@ class WebActivity(ExecutionActivity): :vartype body: any :ivar authentication: Authentication method used for calling the endpoint. :vartype authentication: ~azure.mgmt.datafactory.models.WebActivityAuthentication + :ivar disable_cert_validation: When set to true, Certificate validation will be disabled. + :vartype disable_cert_validation: bool :ivar datasets: List of datasets passed to web endpoint. :vartype datasets: list[~azure.mgmt.datafactory.models.DatasetReference] :ivar linked_services: List of linked services passed to web endpoint. @@ -57807,6 +57811,7 @@ class WebActivity(ExecutionActivity): 'headers': {'key': 'typeProperties.headers', 'type': 'object'}, 'body': {'key': 'typeProperties.body', 'type': 'object'}, 'authentication': {'key': 'typeProperties.authentication', 'type': 'WebActivityAuthentication'}, + 'disable_cert_validation': {'key': 'typeProperties.disableCertValidation', 'type': 'bool'}, 'datasets': {'key': 'typeProperties.datasets', 'type': '[DatasetReference]'}, 'linked_services': {'key': 'typeProperties.linkedServices', 'type': '[LinkedServiceReference]'}, 'connect_via': {'key': 'typeProperties.connectVia', 'type': 'IntegrationRuntimeReference'}, @@ -57827,6 +57832,7 @@ def __init__( headers: Optional[Any] = None, body: Optional[Any] = None, authentication: Optional["WebActivityAuthentication"] = None, + disable_cert_validation: Optional[bool] = None, datasets: Optional[List["DatasetReference"]] = None, linked_services: Optional[List["LinkedServiceReference"]] = None, connect_via: Optional["IntegrationRuntimeReference"] = None, @@ -57863,6 +57869,8 @@ def __init__( :paramtype body: any :keyword authentication: Authentication method used for calling the endpoint. :paramtype authentication: ~azure.mgmt.datafactory.models.WebActivityAuthentication + :keyword disable_cert_validation: When set to true, Certificate validation will be disabled. + :paramtype disable_cert_validation: bool :keyword datasets: List of datasets passed to web endpoint. :paramtype datasets: list[~azure.mgmt.datafactory.models.DatasetReference] :keyword linked_services: List of linked services passed to web endpoint. @@ -57877,6 +57885,7 @@ def __init__( self.headers = headers self.body = body self.authentication = authentication + self.disable_cert_validation = disable_cert_validation self.datasets = datasets self.linked_services = linked_services self.connect_via = connect_via