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 datafactory/resource-manager] Change connection-string to be object and support making severname, d… #2363

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
from .operation_service_specification_py3 import OperationServiceSpecification
from .operation_py3 import Operation
from .operation_list_response_py3 import OperationListResponse
from .responsys_linked_service_py3 import ResponsysLinkedService
from .azure_databricks_linked_service_py3 import AzureDatabricksLinkedService
from .azure_data_lake_analytics_linked_service_py3 import AzureDataLakeAnalyticsLinkedService
from .hd_insight_on_demand_linked_service_py3 import HDInsightOnDemandLinkedService
Expand Down Expand Up @@ -131,6 +132,7 @@
from .sql_server_linked_service_py3 import SqlServerLinkedService
from .azure_sql_dw_linked_service_py3 import AzureSqlDWLinkedService
from .azure_storage_linked_service_py3 import AzureStorageLinkedService
from .responsys_object_dataset_py3 import ResponsysObjectDataset
from .salesforce_marketing_cloud_object_dataset_py3 import SalesforceMarketingCloudObjectDataset
from .vertica_table_dataset_py3 import VerticaTableDataset
from .netezza_table_dataset_py3 import NetezzaTableDataset
Expand Down Expand Up @@ -213,6 +215,7 @@
from .web_activity_py3 import WebActivity
from .redshift_unload_settings_py3 import RedshiftUnloadSettings
from .amazon_redshift_source_py3 import AmazonRedshiftSource
from .responsys_source_py3 import ResponsysSource
from .salesforce_marketing_cloud_source_py3 import SalesforceMarketingCloudSource
from .vertica_source_py3 import VerticaSource
from .netezza_source_py3 import NetezzaSource
Expand Down Expand Up @@ -379,6 +382,7 @@
from .operation_service_specification import OperationServiceSpecification
from .operation import Operation
from .operation_list_response import OperationListResponse
from .responsys_linked_service import ResponsysLinkedService
from .azure_databricks_linked_service import AzureDatabricksLinkedService
from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService
from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService
Expand Down Expand Up @@ -452,6 +456,7 @@
from .sql_server_linked_service import SqlServerLinkedService
from .azure_sql_dw_linked_service import AzureSqlDWLinkedService
from .azure_storage_linked_service import AzureStorageLinkedService
from .responsys_object_dataset import ResponsysObjectDataset
from .salesforce_marketing_cloud_object_dataset import SalesforceMarketingCloudObjectDataset
from .vertica_table_dataset import VerticaTableDataset
from .netezza_table_dataset import NetezzaTableDataset
Expand Down Expand Up @@ -534,6 +539,7 @@
from .web_activity import WebActivity
from .redshift_unload_settings import RedshiftUnloadSettings
from .amazon_redshift_source import AmazonRedshiftSource
from .responsys_source import ResponsysSource
from .salesforce_marketing_cloud_source import SalesforceMarketingCloudSource
from .vertica_source import VerticaSource
from .netezza_source import NetezzaSource
Expand Down Expand Up @@ -768,6 +774,7 @@
'OperationServiceSpecification',
'Operation',
'OperationListResponse',
'ResponsysLinkedService',
'AzureDatabricksLinkedService',
'AzureDataLakeAnalyticsLinkedService',
'HDInsightOnDemandLinkedService',
Expand Down Expand Up @@ -841,6 +848,7 @@
'SqlServerLinkedService',
'AzureSqlDWLinkedService',
'AzureStorageLinkedService',
'ResponsysObjectDataset',
'SalesforceMarketingCloudObjectDataset',
'VerticaTableDataset',
'NetezzaTableDataset',
Expand Down Expand Up @@ -923,6 +931,7 @@
'WebActivity',
'RedshiftUnloadSettings',
'AmazonRedshiftSource',
'ResponsysSource',
'SalesforceMarketingCloudSource',
'VerticaSource',
'NetezzaSource',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureMySqlLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: 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 @@ -53,7 +53,7 @@ class AzureMySqlLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureMySqlLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: 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 @@ -53,7 +53,7 @@ class AzureMySqlLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzurePostgreSqlLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: An ODBC connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: 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 @@ -52,7 +52,7 @@ class AzurePostgreSqlLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzurePostgreSqlLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: An ODBC connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: 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 @@ -52,7 +52,7 @@ class AzurePostgreSqlLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureSqlDatabaseLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
:param service_principal_id: The ID of the service principal used to
authenticate against Azure SQL Database. Type: string (or Expression with
resultType string).
Expand Down Expand Up @@ -63,7 +63,7 @@ class AzureSqlDatabaseLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureSqlDatabaseLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
:param service_principal_id: The ID of the service principal used to
authenticate against Azure SQL Database. Type: string (or Expression with
resultType string).
Expand Down Expand Up @@ -63,7 +63,7 @@ class AzureSqlDatabaseLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureSqlDWLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
: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).
Expand Down Expand Up @@ -63,7 +63,7 @@ class AzureSqlDWLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AzureSqlDWLinkedService(LinkedService):
:param type: Required. Constant filled by server.
:type type: str
:param connection_string: Required. The connection string.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
: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).
Expand Down Expand Up @@ -63,7 +63,7 @@ class AzureSqlDWLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AzureStorageLinkedService(LinkedService):
:type type: str
:param connection_string: The connection string. It is mutually exclusive
with sasUri property.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
:param sas_uri: SAS URI of the Azure Storage resource. It is mutually
exclusive with connectionString property.
:type sas_uri: ~azure.mgmt.datafactory.models.SecretBase
Expand All @@ -56,7 +56,7 @@ class AzureStorageLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AzureStorageLinkedService(LinkedService):
:type type: str
:param connection_string: The connection string. It is mutually exclusive
with sasUri property.
:type connection_string: ~azure.mgmt.datafactory.models.SecretBase
:type connection_string: object
:param sas_uri: SAS URI of the Azure Storage resource. It is mutually
exclusive with connectionString property.
:type sas_uri: ~azure.mgmt.datafactory.models.SecretBase
Expand All @@ -56,7 +56,7 @@ class AzureStorageLinkedService(LinkedService):
'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
'annotations': {'key': 'annotations', 'type': '[object]'},
'type': {'key': 'type', 'type': 'str'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'},
'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'},
'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
}
Expand Down
Loading