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.

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] restapi_auto_datafactory/resource-manager #1972

Merged
merged 4 commits into from
Feb 16, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
30 changes: 30 additions & 0 deletions azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
from .operation_list_response import OperationListResponse
from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService
from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService
from .netezza_linked_service import NetezzaLinkedService
from .vertica_linked_service import VerticaLinkedService
from .zoho_linked_service import ZohoLinkedService
from .xero_linked_service import XeroLinkedService
from .square_linked_service import SquareLinkedService
Expand Down Expand Up @@ -94,6 +96,7 @@
from .custom_data_source_linked_service import CustomDataSourceLinkedService
from .amazon_redshift_linked_service import AmazonRedshiftLinkedService
from .amazon_s3_linked_service import AmazonS3LinkedService
from .sap_ecc_linked_service import SapEccLinkedService
from .sap_cloud_for_customer_linked_service import SapCloudForCustomerLinkedService
from .salesforce_linked_service import SalesforceLinkedService
from .azure_data_lake_store_linked_service import AzureDataLakeStoreLinkedService
Expand Down Expand Up @@ -125,6 +128,8 @@
from .sql_server_linked_service import SqlServerLinkedService
from .azure_sql_dw_linked_service import AzureSqlDWLinkedService
from .azure_storage_linked_service import AzureStorageLinkedService
from .vertica_table_dataset import VerticaTableDataset
from .netezza_table_dataset import NetezzaTableDataset
from .zoho_object_dataset import ZohoObjectDataset
from .xero_object_dataset import XeroObjectDataset
from .square_object_dataset import SquareObjectDataset
Expand Down Expand Up @@ -166,6 +171,7 @@
from .azure_search_index_dataset import AzureSearchIndexDataset
from .web_table_dataset import WebTableDataset
from .sql_server_table_dataset import SqlServerTableDataset
from .sap_ecc_resource_dataset import SapEccResourceDataset
from .sap_cloud_for_customer_resource_dataset import SapCloudForCustomerResourceDataset
from .salesforce_object_dataset import SalesforceObjectDataset
from .relational_table_dataset import RelationalTableDataset
Expand Down Expand Up @@ -202,6 +208,8 @@
from .web_activity import WebActivity
from .redshift_unload_settings import RedshiftUnloadSettings
from .amazon_redshift_source import AmazonRedshiftSource
from .vertica_source import VerticaSource
from .netezza_source import NetezzaSource
from .zoho_source import ZohoSource
from .xero_source import XeroSource
from .square_source import SquareSource
Expand Down Expand Up @@ -241,6 +249,7 @@
from .sql_dw_source import SqlDWSource
from .stored_procedure_parameter import StoredProcedureParameter
from .sql_source import SqlSource
from .sap_ecc_source import SapEccSource
from .sap_cloud_for_customer_source import SapCloudForCustomerSource
from .salesforce_source import SalesforceSource
from .relational_source import RelationalSource
Expand Down Expand Up @@ -288,13 +297,18 @@
from .if_condition_activity import IfConditionActivity
from .execute_pipeline_activity import ExecutePipelineActivity
from .control_activity import ControlActivity
from .linked_integration_runtime import LinkedIntegrationRuntime
from .self_hosted_integration_runtime_node import SelfHostedIntegrationRuntimeNode
from .self_hosted_integration_runtime_status import SelfHostedIntegrationRuntimeStatus
from .managed_integration_runtime_operation_result import ManagedIntegrationRuntimeOperationResult
from .managed_integration_runtime_error import ManagedIntegrationRuntimeError
from .managed_integration_runtime_node import ManagedIntegrationRuntimeNode
from .managed_integration_runtime_status import ManagedIntegrationRuntimeStatus
from .linked_integration_runtime_rbac import LinkedIntegrationRuntimeRbac
from .linked_integration_runtime_key import LinkedIntegrationRuntimeKey
from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties
from .self_hosted_integration_runtime import SelfHostedIntegrationRuntime
from .integration_runtime_custom_setup_script_properties import IntegrationRuntimeCustomSetupScriptProperties
from .integration_runtime_ssis_catalog_info import IntegrationRuntimeSsisCatalogInfo
from .integration_runtime_ssis_properties import IntegrationRuntimeSsisProperties
from .integration_runtime_vnet_properties import IntegrationRuntimeVNetProperties
Expand Down Expand Up @@ -371,6 +385,7 @@
ManagedIntegrationRuntimeNodeStatus,
IntegrationRuntimeSsisCatalogPricingTier,
IntegrationRuntimeLicenseType,
IntegrationRuntimeEdition,
IntegrationRuntimeAuthKeyName,
)

Expand Down Expand Up @@ -425,6 +440,8 @@
'OperationListResponse',
'AzureDataLakeAnalyticsLinkedService',
'HDInsightOnDemandLinkedService',
'NetezzaLinkedService',
'VerticaLinkedService',
'ZohoLinkedService',
'XeroLinkedService',
'SquareLinkedService',
Expand Down Expand Up @@ -460,6 +477,7 @@
'CustomDataSourceLinkedService',
'AmazonRedshiftLinkedService',
'AmazonS3LinkedService',
'SapEccLinkedService',
'SapCloudForCustomerLinkedService',
'SalesforceLinkedService',
'AzureDataLakeStoreLinkedService',
Expand Down Expand Up @@ -491,6 +509,8 @@
'SqlServerLinkedService',
'AzureSqlDWLinkedService',
'AzureStorageLinkedService',
'VerticaTableDataset',
'NetezzaTableDataset',
'ZohoObjectDataset',
'XeroObjectDataset',
'SquareObjectDataset',
Expand Down Expand Up @@ -532,6 +552,7 @@
'AzureSearchIndexDataset',
'WebTableDataset',
'SqlServerTableDataset',
'SapEccResourceDataset',
'SapCloudForCustomerResourceDataset',
'SalesforceObjectDataset',
'RelationalTableDataset',
Expand Down Expand Up @@ -568,6 +589,8 @@
'WebActivity',
'RedshiftUnloadSettings',
'AmazonRedshiftSource',
'VerticaSource',
'NetezzaSource',
'ZohoSource',
'XeroSource',
'SquareSource',
Expand Down Expand Up @@ -607,6 +630,7 @@
'SqlDWSource',
'StoredProcedureParameter',
'SqlSource',
'SapEccSource',
'SapCloudForCustomerSource',
'SalesforceSource',
'RelationalSource',
Expand Down Expand Up @@ -654,13 +678,18 @@
'IfConditionActivity',
'ExecutePipelineActivity',
'ControlActivity',
'LinkedIntegrationRuntime',
'SelfHostedIntegrationRuntimeNode',
'SelfHostedIntegrationRuntimeStatus',
'ManagedIntegrationRuntimeOperationResult',
'ManagedIntegrationRuntimeError',
'ManagedIntegrationRuntimeNode',
'ManagedIntegrationRuntimeStatus',
'LinkedIntegrationRuntimeRbac',
'LinkedIntegrationRuntimeKey',
'LinkedIntegrationRuntimeProperties',
'SelfHostedIntegrationRuntime',
'IntegrationRuntimeCustomSetupScriptProperties',
'IntegrationRuntimeSsisCatalogInfo',
'IntegrationRuntimeSsisProperties',
'IntegrationRuntimeVNetProperties',
Expand Down Expand Up @@ -736,5 +765,6 @@
'ManagedIntegrationRuntimeNodeStatus',
'IntegrationRuntimeSsisCatalogPricingTier',
'IntegrationRuntimeLicenseType',
'IntegrationRuntimeEdition',
'IntegrationRuntimeAuthKeyName',
]
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureBatchLinkedService(LinkedService):
Expression with resultType string).
:type account_name: object
:param access_key: The Azure Batch account access key.
:type access_key: ~azure.mgmt.datafactory.models.SecureString
:type access_key: ~azure.mgmt.datafactory.models.SecretBase
:param batch_uri: The Azure Batch URI. Type: string (or Expression with
resultType string).
:type batch_uri: object
Expand Down Expand Up @@ -59,7 +59,7 @@ class AzureBatchLinkedService(LinkedService):
'description': {'key': 'description', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'account_name': {'key': 'typeProperties.accountName', 'type': 'object'},
'access_key': {'key': 'typeProperties.accessKey', 'type': 'SecureString'},
'access_key': {'key': 'typeProperties.accessKey', 'type': 'SecretBase'},
'batch_uri': {'key': 'typeProperties.batchUri', 'type': 'object'},
'pool_name': {'key': 'typeProperties.poolName', 'type': 'object'},
'linked_service_name': {'key': 'typeProperties.linkedServiceName', 'type': 'LinkedServiceReference'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
:type service_principal_id: object
:param service_principal_key: The Key of the application used to
authenticate against the Azure Data Lake Analytics account.
:type service_principal_key: ~azure.mgmt.datafactory.models.SecureString
:type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase
: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
Expand Down Expand Up @@ -68,7 +68,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
'type': {'key': 'type', 'type': 'str'},
'account_name': {'key': 'typeProperties.accountName', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecureString'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
'subscription_id': {'key': 'typeProperties.subscriptionId', 'type': 'object'},
'resource_group_name': {'key': 'typeProperties.resourceGroupName', 'type': 'object'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AzureMLLinkedService(LinkedService):
Service endpoint. Type: string (or Expression with resultType string).
:type ml_endpoint: object
:param api_key: The API key for accessing the Azure ML model endpoint.
:type api_key: ~azure.mgmt.datafactory.models.SecureString
:type api_key: ~azure.mgmt.datafactory.models.SecretBase
:param update_resource_endpoint: The Update Resource REST URL for an Azure
ML Web Service endpoint. Type: string (or Expression with resultType
string).
Expand All @@ -41,7 +41,7 @@ class AzureMLLinkedService(LinkedService):
:param service_principal_key: The key of the service principal used to
authenticate against the ARM-based updateResourceEndpoint of an Azure ML
web service.
:type service_principal_key: ~azure.mgmt.datafactory.models.SecureString
:type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase
: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
Expand All @@ -63,10 +63,10 @@ class AzureMLLinkedService(LinkedService):
'description': {'key': 'description', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'ml_endpoint': {'key': 'typeProperties.mlEndpoint', 'type': 'object'},
'api_key': {'key': 'typeProperties.apiKey', 'type': 'SecureString'},
'api_key': {'key': 'typeProperties.apiKey', 'type': 'SecretBase'},
'update_resource_endpoint': {'key': 'typeProperties.updateResourceEndpoint', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecureString'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ class AzureSqlDatabaseLinkedService(LinkedService):
:type type: str
:param connection_string: The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:param service_principal_id: The ID of the service principal used to
authenticate against Azure SQL Database. Type: string (or Expression with
resultType string).
:type service_principal_id: object
:param service_principal_key: The key of the service principal used to
authenticate against Azure SQL Database.
:type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase
: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
:param encrypted_credential: The encrypted credential used for
authentication. Credentials are encrypted using the integration runtime
credential manager. Type: string (or Expression with resultType string).
Expand All @@ -44,11 +54,17 @@ class AzureSqlDatabaseLinkedService(LinkedService):
'description': {'key': 'description', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None):
def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None):
super(AzureSqlDatabaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description)
self.connection_string = connection_string
self.service_principal_id = service_principal_id
self.service_principal_key = service_principal_key
self.tenant = tenant
self.encrypted_credential = encrypted_credential
self.type = 'AzureSqlDatabase'
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ class AzureSqlDWLinkedService(LinkedService):
:type type: str
:param connection_string: The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:param service_principal_id: The ID of the service principal used to
authenticate against Azure SQL Data Warehouse. Type: string (or Expression
with resultType string).
:type service_principal_id: object
:param service_principal_key: The key of the service principal used to
authenticate against Azure SQL Data Warehouse.
:type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase
: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
:param encrypted_credential: The encrypted credential used for
authentication. Credentials are encrypted using the integration runtime
credential manager. Type: string (or Expression with resultType string).
Expand All @@ -44,11 +54,17 @@ class AzureSqlDWLinkedService(LinkedService):
'description': {'key': 'description', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None):
def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None):
super(AzureSqlDWLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description)
self.connection_string = connection_string
self.service_principal_id = service_principal_id
self.service_principal_key = service_principal_key
self.tenant = tenant
self.encrypted_credential = encrypted_credential
self.type = 'AzureSqlDW'
Loading