Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR azure-mgmt-datafactory] [DataFactory]Set servicePrincipalId,servicePrincipalKey and tenant to be optional from AzureDataExplorerLinkedServiceTypeProperties #4031

Closed
wants to merge 1 commit into from
Closed

[AutoPR azure-mgmt-datafactory] [DataFactory]Set servicePrincipalId,servicePrincipalKey and tenant to be optional from AzureDataExplorerLinkedServiceTypeProperties #4031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
from ._models_py3 import CustomActivityReferenceObject
from ._models_py3 import CustomDataset
from ._models_py3 import CustomDataSourceLinkedService
from ._models_py3 import CustomEventsTrigger
from ._models_py3 import CustomSetupBase
from ._models_py3 import DatabricksNotebookActivity
from ._models_py3 import DatabricksSparkJarActivity
Expand Down Expand Up @@ -371,6 +372,7 @@
from ._models_py3 import ManagedPrivateEndpoint
from ._models_py3 import ManagedPrivateEndpointResource
from ._models_py3 import ManagedVirtualNetwork
from ._models_py3 import ManagedVirtualNetworkReference
from ._models_py3 import ManagedVirtualNetworkResource
from ._models_py3 import MappingDataFlow
from ._models_py3 import MariaDBLinkedService
Expand Down Expand Up @@ -791,6 +793,7 @@
from ._models import CustomActivityReferenceObject
from ._models import CustomDataset
from ._models import CustomDataSourceLinkedService
from ._models import CustomEventsTrigger
from ._models import CustomSetupBase
from ._models import DatabricksNotebookActivity
from ._models import DatabricksSparkJarActivity
Expand Down Expand Up @@ -1003,6 +1006,7 @@
from ._models import ManagedPrivateEndpoint
from ._models import ManagedPrivateEndpointResource
from ._models import ManagedVirtualNetwork
from ._models import ManagedVirtualNetworkReference
from ._models import ManagedVirtualNetworkResource
from ._models import MappingDataFlow
from ._models import MariaDBLinkedService
Expand Down Expand Up @@ -1518,6 +1522,7 @@
'CustomActivityReferenceObject',
'CustomDataset',
'CustomDataSourceLinkedService',
'CustomEventsTrigger',
'CustomSetupBase',
'DatabricksNotebookActivity',
'DatabricksSparkJarActivity',
Expand Down Expand Up @@ -1730,6 +1735,7 @@
'ManagedPrivateEndpoint',
'ManagedPrivateEndpointResource',
'ManagedVirtualNetwork',
'ManagedVirtualNetworkReference',
'ManagedVirtualNetworkResource',
'MappingDataFlow',
'MariaDBLinkedService',
Expand Down
162 changes: 147 additions & 15 deletions sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3333,10 +3333,17 @@ class AzureDatabricksLinkedService(LinkedService):
Databricks deployment. Type: string (or Expression with resultType
string).
:type domain: object
:param access_token: Required. Access token for databricks REST API. Refer
to https://docs.azuredatabricks.net/api/latest/authentication.html. Type:
:param access_token: Access token for databricks REST API. Refer to
https://docs.azuredatabricks.net/api/latest/authentication.html. Type:
string (or Expression with resultType string).
:type access_token: ~azure.mgmt.datafactory.models.SecretBase
:param authentication: Required to specify MSI, if using Workspace
resource id for databricks REST API. Type: string (or Expression with
resultType string).
:type authentication: object
:param workspace_resource_id: Workspace resource id for databricks REST
API. Type: string (or Expression with resultType string).
:type workspace_resource_id: object
:param existing_cluster_id: The id of an existing interactive cluster that
will be used for all runs of this activity. Type: string (or Expression
with resultType string).
Expand Down Expand Up @@ -3394,12 +3401,15 @@ class AzureDatabricksLinkedService(LinkedService):
authentication. Credentials are encrypted using the integration runtime
credential manager. Type: string (or Expression with resultType string).
:type encrypted_credential: object
:param policy_id: The policy id for limiting the ability to configure
clusters based on a user defined set of rules. Type: string (or Expression
with resultType string).
:type policy_id: object
"""

_validation = {
'type': {'required': True},
'domain': {'required': True},
'access_token': {'required': True},
}

_attribute_map = {
Expand All @@ -3411,6 +3421,8 @@ class AzureDatabricksLinkedService(LinkedService):
'type': {'key': 'type', 'type': 'str'},
'domain': {'key': 'typeProperties.domain', 'type': 'object'},
'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'},
'authentication': {'key': 'typeProperties.authentication', 'type': 'object'},
'workspace_resource_id': {'key': 'typeProperties.workspaceResourceId', 'type': 'object'},
'existing_cluster_id': {'key': 'typeProperties.existingClusterId', 'type': 'object'},
'instance_pool_id': {'key': 'typeProperties.instancePoolId', 'type': 'object'},
'new_cluster_version': {'key': 'typeProperties.newClusterVersion', 'type': 'object'},
Expand All @@ -3424,12 +3436,15 @@ class AzureDatabricksLinkedService(LinkedService):
'new_cluster_init_scripts': {'key': 'typeProperties.newClusterInitScripts', 'type': 'object'},
'new_cluster_enable_elastic_disk': {'key': 'typeProperties.newClusterEnableElasticDisk', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
'policy_id': {'key': 'typeProperties.policyId', 'type': 'object'},
}

def __init__(self, **kwargs):
super(AzureDatabricksLinkedService, self).__init__(**kwargs)
self.domain = kwargs.get('domain', None)
self.access_token = kwargs.get('access_token', None)
self.authentication = kwargs.get('authentication', None)
self.workspace_resource_id = kwargs.get('workspace_resource_id', None)
self.existing_cluster_id = kwargs.get('existing_cluster_id', None)
self.instance_pool_id = kwargs.get('instance_pool_id', None)
self.new_cluster_version = kwargs.get('new_cluster_version', None)
Expand All @@ -3443,6 +3458,7 @@ def __init__(self, **kwargs):
self.new_cluster_init_scripts = kwargs.get('new_cluster_init_scripts', None)
self.new_cluster_enable_elastic_disk = kwargs.get('new_cluster_enable_elastic_disk', None)
self.encrypted_credential = kwargs.get('encrypted_credential', None)
self.policy_id = kwargs.get('policy_id', None)
self.type = 'AzureDatabricks'


Expand Down Expand Up @@ -3595,28 +3611,25 @@ class AzureDataExplorerLinkedService(LinkedService):
https://<clusterName>.<regionName>.kusto.windows.net. Type: string (or
Expression with resultType string)
:type endpoint: object
:param service_principal_id: Required. The ID of the service principal
used to authenticate against Azure Data Explorer. Type: string (or
Expression with resultType string).
:param service_principal_id: The ID of the service principal used to
authenticate against Azure Data Explorer. Type: string (or Expression with
resultType string).
:type service_principal_id: object
:param service_principal_key: Required. The key of the service principal
used to authenticate against Kusto.
:param service_principal_key: The key of the service principal used to
authenticate against Kusto.
:type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase
:param database: Required. Database name for connection. Type: string (or
Expression with resultType string).
:type database: object
:param tenant: Required. The name or ID of the tenant to which the service
principal belongs. Type: string (or Expression with resultType string).
:param tenant: The name or ID of the tenant to which the service principal
belongs. Type: string (or Expression with resultType string).
:type tenant: object
"""

_validation = {
'type': {'required': True},
'endpoint': {'required': True},
'service_principal_id': {'required': True},
'service_principal_key': {'required': True},
'database': {'required': True},
'tenant': {'required': True},
}

_attribute_map = {
Expand Down Expand Up @@ -7388,7 +7401,8 @@ class MultiplePipelineTrigger(Trigger):
pipeline.

You probably want to use the sub-classes and not this class directly. Known
sub-classes are: BlobEventsTrigger, BlobTrigger, ScheduleTrigger
sub-classes are: CustomEventsTrigger, BlobEventsTrigger, BlobTrigger,
ScheduleTrigger

Variables are only populated by the server, and will be ignored when
sending a request.
Expand Down Expand Up @@ -7430,7 +7444,7 @@ class MultiplePipelineTrigger(Trigger):
}

_subtype_map = {
'type': {'BlobEventsTrigger': 'BlobEventsTrigger', 'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'}
'type': {'CustomEventsTrigger': 'CustomEventsTrigger', 'BlobEventsTrigger': 'BlobEventsTrigger', 'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'}
}

def __init__(self, **kwargs):
Expand Down Expand Up @@ -9697,6 +9711,10 @@ class CustomActivity(ExecutionActivity):
:param retention_time_in_days: The retention time for the files submitted
for custom activity. Type: double (or Expression with resultType double).
:type retention_time_in_days: object
:param auto_user_specification: Elevation level and scope for the user,
default is nonadmin task. Type: string (or Expression with resultType
double).
:type auto_user_specification: object
"""

_validation = {
Expand All @@ -9720,6 +9738,7 @@ class CustomActivity(ExecutionActivity):
'reference_objects': {'key': 'typeProperties.referenceObjects', 'type': 'CustomActivityReferenceObject'},
'extended_properties': {'key': 'typeProperties.extendedProperties', 'type': '{object}'},
'retention_time_in_days': {'key': 'typeProperties.retentionTimeInDays', 'type': 'object'},
'auto_user_specification': {'key': 'typeProperties.autoUserSpecification', 'type': 'object'},
}

def __init__(self, **kwargs):
Expand All @@ -9730,6 +9749,7 @@ def __init__(self, **kwargs):
self.reference_objects = kwargs.get('reference_objects', None)
self.extended_properties = kwargs.get('extended_properties', None)
self.retention_time_in_days = kwargs.get('retention_time_in_days', None)
self.auto_user_specification = kwargs.get('auto_user_specification', None)
self.type = 'Custom'


Expand Down Expand Up @@ -9859,6 +9879,76 @@ def __init__(self, **kwargs):
self.type = 'CustomDataSource'


class CustomEventsTrigger(MultiplePipelineTrigger):
"""Trigger that runs every time a custom event is received.

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.

:param additional_properties: Unmatched properties from the message are
deserialized this collection
:type additional_properties: dict[str, object]
:param description: Trigger description.
:type description: str
:ivar runtime_state: Indicates if trigger is running or not. Updated when
Start/Stop APIs are called on the Trigger. Possible values include:
'Started', 'Stopped', 'Disabled'
:vartype runtime_state: str or
~azure.mgmt.datafactory.models.TriggerRuntimeState
:param annotations: List of tags that can be used for describing the
trigger.
:type annotations: list[object]
:param type: Required. Constant filled by server.
:type type: str
:param pipelines: Pipelines that need to be started.
:type pipelines:
list[~azure.mgmt.datafactory.models.TriggerPipelineReference]
:param subject_begins_with: The event subject must begin with the pattern
provided for trigger to fire. At least one of these must be provided:
subjectBeginsWith, subjectEndsWith.
:type subject_begins_with: str
:param subject_ends_with: The event subject must end with the pattern
provided for trigger to fire. At least one of these must be provided:
subjectBeginsWith, subjectEndsWith.
:type subject_ends_with: str
:param events: Required. The list of event types that cause this trigger
to fire.
:type events: list[object]
:param scope: Required. The ARM resource ID of the Azure Event Grid Topic.
:type scope: str
"""

_validation = {
'runtime_state': {'readonly': True},
'type': {'required': True},
'events': {'required': True},
'scope': {'required': True},
}

_attribute_map = {
'additional_properties': {'key': '', 'type': '{object}'},
'description': {'key': 'description', 'type': 'str'},
'runtime_state': {'key': 'runtimeState', 'type': 'str'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'pipelines': {'key': 'pipelines', 'type': '[TriggerPipelineReference]'},
'subject_begins_with': {'key': 'typeProperties.subjectBeginsWith', 'type': 'str'},
'subject_ends_with': {'key': 'typeProperties.subjectEndsWith', 'type': 'str'},
'events': {'key': 'typeProperties.events', 'type': '[object]'},
'scope': {'key': 'typeProperties.scope', 'type': 'str'},
}

def __init__(self, **kwargs):
super(CustomEventsTrigger, self).__init__(**kwargs)
self.subject_begins_with = kwargs.get('subject_begins_with', None)
self.subject_ends_with = kwargs.get('subject_ends_with', None)
self.events = kwargs.get('events', None)
self.scope = kwargs.get('scope', None)
self.type = 'CustomEventsTrigger'


class DatabricksNotebookActivity(ExecutionActivity):
"""DatabricksNotebook activity.

Expand Down Expand Up @@ -18982,6 +19072,9 @@ class IntegrationRuntimeSsisCatalogInfo(Model):
values include: 'Basic', 'Standard', 'Premium', 'PremiumRS'
:type catalog_pricing_tier: str or
~azure.mgmt.datafactory.models.IntegrationRuntimeSsisCatalogPricingTier
:param dual_standby_pair_name: The dual standby pair name of Azure-SSIS
Integration Runtimes to support SSISDB failover.
:type dual_standby_pair_name: str
"""

_validation = {
Expand All @@ -18994,6 +19087,7 @@ class IntegrationRuntimeSsisCatalogInfo(Model):
'catalog_admin_user_name': {'key': 'catalogAdminUserName', 'type': 'str'},
'catalog_admin_password': {'key': 'catalogAdminPassword', 'type': 'SecureString'},
'catalog_pricing_tier': {'key': 'catalogPricingTier', 'type': 'str'},
'dual_standby_pair_name': {'key': 'dualStandbyPairName', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand All @@ -19003,6 +19097,7 @@ def __init__(self, **kwargs):
self.catalog_admin_user_name = kwargs.get('catalog_admin_user_name', None)
self.catalog_admin_password = kwargs.get('catalog_admin_password', None)
self.catalog_pricing_tier = kwargs.get('catalog_pricing_tier', None)
self.dual_standby_pair_name = kwargs.get('dual_standby_pair_name', None)


class IntegrationRuntimeSsisProperties(Model):
Expand Down Expand Up @@ -20370,6 +20465,9 @@ class ManagedIntegrationRuntime(IntegrationRuntime):
:param ssis_properties: SSIS properties for managed integration runtime.
:type ssis_properties:
~azure.mgmt.datafactory.models.IntegrationRuntimeSsisProperties
:param managed_virtual_network: Managed Virtual Network reference.
:type managed_virtual_network:
~azure.mgmt.datafactory.models.ManagedVirtualNetworkReference
"""

_validation = {
Expand All @@ -20384,13 +20482,15 @@ class ManagedIntegrationRuntime(IntegrationRuntime):
'state': {'key': 'state', 'type': 'str'},
'compute_properties': {'key': 'typeProperties.computeProperties', 'type': 'IntegrationRuntimeComputeProperties'},
'ssis_properties': {'key': 'typeProperties.ssisProperties', 'type': 'IntegrationRuntimeSsisProperties'},
'managed_virtual_network': {'key': 'managedVirtualNetwork', 'type': 'ManagedVirtualNetworkReference'},
}

def __init__(self, **kwargs):
super(ManagedIntegrationRuntime, self).__init__(**kwargs)
self.state = None
self.compute_properties = kwargs.get('compute_properties', None)
self.ssis_properties = kwargs.get('ssis_properties', None)
self.managed_virtual_network = kwargs.get('managed_virtual_network', None)
self.type = 'Managed'


Expand Down Expand Up @@ -20723,6 +20823,38 @@ def __init__(self, **kwargs):
self.alias = None


class ManagedVirtualNetworkReference(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: Required. Managed Virtual Network reference type. Default
value: "ManagedVirtualNetworkReference" .
:vartype type: str
:param reference_name: Required. Reference ManagedVirtualNetwork name.
:type reference_name: str
"""

_validation = {
'type': {'required': True, 'constant': True},
'reference_name': {'required': True},
}

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'reference_name': {'key': 'referenceName', 'type': 'str'},
}

type = "ManagedVirtualNetworkReference"

def __init__(self, **kwargs):
super(ManagedVirtualNetworkReference, self).__init__(**kwargs)
self.reference_name = kwargs.get('reference_name', None)


class ManagedVirtualNetworkResource(SubResource):
"""Managed Virtual Network resource type.

Expand Down
Loading