diff --git a/sdk/datafactory/azure-mgmt-datafactory/_meta.json b/sdk/datafactory/azure-mgmt-datafactory/_meta.json index 3d4dbf9b9623..248b8d350595 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/_meta.json +++ b/sdk/datafactory/azure-mgmt-datafactory/_meta.json @@ -4,8 +4,8 @@ "@autorest/python@5.13.0", "@autorest/modelerfour@4.19.3" ], - "commit": "40fdd84627937fdd8b3b06486497c8f2cfced350", + "commit": "e2440a5e5483f0797588959723c1dd39c0a03871", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", + "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.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/_metadata.json b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_metadata.json deleted file mode 100644 index dc3aad5c2427..000000000000 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_metadata.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "chosen_version": "2018-06-01", - "total_api_version_list": ["2018-06-01"], - "client": { - "name": "DataFactoryManagementClient", - "filename": "_data_factory_management_client", - "description": "The Azure Data Factory V2 management API provides a RESTful set of web services that interact with Azure Data Factory V2 services.", - "host_value": "\"https://management.azure.com\"", - "parameterized_host_template": null, - "azure_arm": true, - "has_lro_operations": true, - "client_side_validation": false, - "sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"DataFactoryManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"DataFactoryManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}" - }, - "global_parameters": { - "sync": { - "credential": { - "signature": "credential, # type: \"TokenCredential\"", - "description": "Credential needed for the client to connect to Azure.", - "docstring_type": "~azure.core.credentials.TokenCredential", - "required": true - }, - "subscription_id": { - "signature": "subscription_id, # type: str", - "description": "The subscription identifier.", - "docstring_type": "str", - "required": true - } - }, - "async": { - "credential": { - "signature": "credential: \"AsyncTokenCredential\",", - "description": "Credential needed for the client to connect to Azure.", - "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential", - "required": true - }, - "subscription_id": { - "signature": "subscription_id: str,", - "description": "The subscription identifier.", - "docstring_type": "str", - "required": true - } - }, - "constant": { - }, - "call": "credential, subscription_id", - "service_client_specific": { - "sync": { - "api_version": { - "signature": "api_version=None, # type: Optional[str]", - "description": "API version to use if no profile is provided, or if missing in profile.", - "docstring_type": "str", - "required": false - }, - "base_url": { - "signature": "base_url=\"https://management.azure.com\", # type: str", - "description": "Service URL", - "docstring_type": "str", - "required": false - }, - "profile": { - "signature": "profile=KnownProfiles.default, # type: KnownProfiles", - "description": "A profile definition, from KnownProfiles to dict.", - "docstring_type": "azure.profiles.KnownProfiles", - "required": false - } - }, - "async": { - "api_version": { - "signature": "api_version: Optional[str] = None,", - "description": "API version to use if no profile is provided, or if missing in profile.", - "docstring_type": "str", - "required": false - }, - "base_url": { - "signature": "base_url: str = \"https://management.azure.com\",", - "description": "Service URL", - "docstring_type": "str", - "required": false - }, - "profile": { - "signature": "profile: KnownProfiles = KnownProfiles.default,", - "description": "A profile definition, from KnownProfiles to dict.", - "docstring_type": "azure.profiles.KnownProfiles", - "required": false - } - } - } - }, - "config": { - "credential": true, - "credential_scopes": ["https://management.azure.com/.default"], - "credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)", - "credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)", - "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}", - "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}" - }, - "operation_groups": { - "operations": "Operations", - "factories": "FactoriesOperations", - "exposure_control": "ExposureControlOperations", - "integration_runtimes": "IntegrationRuntimesOperations", - "integration_runtime_object_metadata": "IntegrationRuntimeObjectMetadataOperations", - "integration_runtime_nodes": "IntegrationRuntimeNodesOperations", - "linked_services": "LinkedServicesOperations", - "datasets": "DatasetsOperations", - "pipelines": "PipelinesOperations", - "pipeline_runs": "PipelineRunsOperations", - "activity_runs": "ActivityRunsOperations", - "triggers": "TriggersOperations", - "trigger_runs": "TriggerRunsOperations", - "data_flows": "DataFlowsOperations", - "data_flow_debug_session": "DataFlowDebugSessionOperations", - "managed_virtual_networks": "ManagedVirtualNetworksOperations", - "managed_private_endpoints": "ManagedPrivateEndpointsOperations", - "private_end_point_connections": "PrivateEndPointConnectionsOperations", - "private_endpoint_connection": "PrivateEndpointConnectionOperations", - "private_link_resources": "PrivateLinkResourcesOperations", - "global_parameters": "GlobalParametersOperations" - } -} \ 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 ad83c2a47bf7..c47f66669f1b 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.6.0" +VERSION = "1.0.0" 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 554cca2051f0..01a00efd87ed 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 @@ -538,6 +538,7 @@ class RestServiceAuthenticationType(with_metaclass(CaseInsensitiveEnumMeta, str, BASIC = "Basic" AAD_SERVICE_PRINCIPAL = "AadServicePrincipal" MANAGED_SERVICE_IDENTITY = "ManagedServiceIdentity" + O_AUTH2_CLIENT_CREDENTIAL = "OAuth2ClientCredential" class RunQueryFilterOperand(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """Parameter name to be used for filter. The allowed operands to query pipeline runs are 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 243fbe0ee62c..047dca0b2975 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 @@ -23676,7 +23676,7 @@ class FactoryGitHubConfiguration(FactoryRepoConfiguration): :vartype root_folder: str :ivar last_commit_id: Last commit id. :vartype last_commit_id: str - :ivar host_name: GitHub Enterprise host name. For example: https://github.mydomain.com. + :ivar host_name: GitHub Enterprise host name. For example: ``https://github.mydomain.com``. :vartype host_name: str :ivar client_id: GitHub bring your own app client id. :vartype client_id: str @@ -23728,7 +23728,7 @@ def __init__( :paramtype root_folder: str :keyword last_commit_id: Last commit id. :paramtype last_commit_id: str - :keyword host_name: GitHub Enterprise host name. For example: https://github.mydomain.com. + :keyword host_name: GitHub Enterprise host name. For example: ``https://github.mydomain.com``. :paramtype host_name: str :keyword client_id: GitHub bring your own app client id. :paramtype client_id: str @@ -44927,7 +44927,7 @@ class RestServiceLinkedService(LinkedService): :vartype enable_server_certificate_validation: any :ivar authentication_type: Required. Type of authentication used to connect to the REST service. Possible values include: "Anonymous", "Basic", "AadServicePrincipal", - "ManagedServiceIdentity". + "ManagedServiceIdentity", "OAuth2ClientCredential". :vartype authentication_type: str or ~azure.mgmt.datafactory.models.RestServiceAuthenticationType :ivar user_name: The user name used in Basic authentication type. @@ -44958,6 +44958,20 @@ class RestServiceLinkedService(LinkedService): :vartype encrypted_credential: any :ivar credential: The credential reference containing authentication information. :vartype credential: ~azure.mgmt.datafactory.models.CredentialReference + :ivar client_id: The client ID associated with your application. Type: string (or Expression + with resultType string). + :vartype client_id: any + :ivar client_secret: The client secret associated with your application. + :vartype client_secret: ~azure.mgmt.datafactory.models.SecretBase + :ivar token_endpoint: The token endpoint of the authorization server to acquire access token. + Type: string (or Expression with resultType string). + :vartype token_endpoint: any + :ivar resource: The target service or resource to which the access will be requested. Type: + string (or Expression with resultType string). + :vartype resource: any + :ivar scope: The scope of the access required. It describes what kind of access will be + requested. Type: string (or Expression with resultType string). + :vartype scope: any """ _validation = { @@ -44986,6 +45000,11 @@ class RestServiceLinkedService(LinkedService): 'aad_resource_id': {'key': 'typeProperties.aadResourceId', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, 'credential': {'key': 'typeProperties.credential', 'type': 'CredentialReference'}, + 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, + 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, + 'token_endpoint': {'key': 'typeProperties.tokenEndpoint', 'type': 'object'}, + 'resource': {'key': 'typeProperties.resource', 'type': 'object'}, + 'scope': {'key': 'typeProperties.scope', 'type': 'object'}, } def __init__( @@ -45009,6 +45028,11 @@ def __init__( aad_resource_id: Optional[Any] = None, encrypted_credential: Optional[Any] = None, credential: Optional["CredentialReference"] = None, + client_id: Optional[Any] = None, + client_secret: Optional["SecretBase"] = None, + token_endpoint: Optional[Any] = None, + resource: Optional[Any] = None, + scope: Optional[Any] = None, **kwargs ): """ @@ -45031,7 +45055,7 @@ def __init__( :paramtype enable_server_certificate_validation: any :keyword authentication_type: Required. Type of authentication used to connect to the REST service. Possible values include: "Anonymous", "Basic", "AadServicePrincipal", - "ManagedServiceIdentity". + "ManagedServiceIdentity", "OAuth2ClientCredential". :paramtype authentication_type: str or ~azure.mgmt.datafactory.models.RestServiceAuthenticationType :keyword user_name: The user name used in Basic authentication type. @@ -45062,6 +45086,20 @@ def __init__( :paramtype encrypted_credential: any :keyword credential: The credential reference containing authentication information. :paramtype credential: ~azure.mgmt.datafactory.models.CredentialReference + :keyword client_id: The client ID associated with your application. Type: string (or Expression + with resultType string). + :paramtype client_id: any + :keyword client_secret: The client secret associated with your application. + :paramtype client_secret: ~azure.mgmt.datafactory.models.SecretBase + :keyword token_endpoint: The token endpoint of the authorization server to acquire access + token. Type: string (or Expression with resultType string). + :paramtype token_endpoint: any + :keyword resource: The target service or resource to which the access will be requested. Type: + string (or Expression with resultType string). + :paramtype resource: any + :keyword scope: The scope of the access required. It describes what kind of access will be + requested. Type: string (or Expression with resultType string). + :paramtype scope: any """ super(RestServiceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.type = 'RestService' # type: str @@ -45078,6 +45116,11 @@ def __init__( self.aad_resource_id = aad_resource_id self.encrypted_credential = encrypted_credential self.credential = credential + self.client_id = client_id + self.client_secret = client_secret + self.token_endpoint = token_endpoint + self.resource = resource + self.scope = scope class RestSink(CopySink):