[AutoPR datafactory/resource-manager] Change connection-string to be …

…object and support making severname, d… (#2363) * Generated from 5a4a7d356b6a096b96e0e20a050c20d22ab32150 Change connection-string to be object and support making severname, databasename visible to customers * Generated from a3865a4230e1cd415b7970b09d82083432fc2b9f Update description * Generated from a3865a4230e1cd415b7970b09d82083432fc2b9f Update description
Azure · Apr 20, 2018 · 29b4013 · 29b4013
1 parent 259e201
commit 29b4013
Show file tree

Hide file tree

Showing 54 changed files with 612 additions and 159 deletions.
diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -58,7 +58,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class DataFactoryManagementClient(object):
+class DataFactoryManagementClient(SDKClient):
     """The Azure Data Factory V2 management API provides a RESTful set of web services that interact with Azure Data Factory V2 services.
 
     :ivar config: Configuration for client.
@@ -97,7 +97,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = DataFactoryManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(DataFactoryManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-09-01-preview'

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -768,6 +774,7 @@
     'OperationServiceSpecification',
     'Operation',
     'OperationListResponse',
+    'ResponsysLinkedService',
     'AzureDatabricksLinkedService',
     'AzureDataLakeAnalyticsLinkedService',
     'HDInsightOnDemandLinkedService',
@@ -841,6 +848,7 @@
     'SqlServerLinkedService',
     'AzureSqlDWLinkedService',
     'AzureStorageLinkedService',
+    'ResponsysObjectDataset',
     'SalesforceMarketingCloudObjectDataset',
     'VerticaTableDataset',
     'NetezzaTableDataset',
@@ -923,6 +931,7 @@
     'WebActivity',
     'RedshiftUnloadSettings',
     'AmazonRedshiftSource',
+    'ResponsysSource',
     'SalesforceMarketingCloudSource',
     'VerticaSource',
     'NetezzaSource',

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py
@@ -44,7 +44,7 @@ class AzureKeyVaultSecretReference(SecretBase):
     }
 
     def __init__(self, *, store, secret_name, secret_version=None, **kwargs) -> None:
-        super(AzureKeyVaultSecretReference, self).__init__(, **kwargs)
+        super(AzureKeyVaultSecretReference, self).__init__(**kwargs)
         self.store = store
         self.secret_name = secret_name
         self.secret_version = secret_version

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py
@@ -33,8 +33,9 @@ class AzureMySqlLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -53,7 +54,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'},
     }
 

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py
@@ -33,8 +33,9 @@ class AzureMySqlLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -53,7 +54,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'},
     }
 

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py
@@ -33,8 +33,9 @@ class AzurePostgreSqlLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: An ODBC connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -52,7 +53,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'},
     }
 

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py
@@ -33,8 +33,9 @@ class AzurePostgreSqlLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: An ODBC connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -52,7 +53,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'},
     }
 

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py
@@ -33,8 +33,9 @@ class AzureSqlDatabaseLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -63,7 +64,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'},

diff --git a/...e-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py b/...e-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py
@@ -33,8 +33,9 @@ class AzureSqlDatabaseLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference.
+    :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).
@@ -63,7 +64,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'},

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py
@@ -33,8 +33,10 @@ class AzureSqlDWLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference. Type: string, SecureString
+     or AzureKeyVaultSecretReference.
+    :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).
@@ -63,7 +65,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'},

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py
@@ -33,8 +33,10 @@ class AzureSqlDWLinkedService(LinkedService):
     :type annotations: list[object]
     :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
+    :param connection_string: Required. The connection string. Type: string,
+     SecureString or AzureKeyVaultSecretReference. Type: string, SecureString
+     or AzureKeyVaultSecretReference.
+    :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).
@@ -63,7 +65,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'},

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py
@@ -34,8 +34,9 @@ class AzureStorageLinkedService(LinkedService):
     :param type: Required. Constant filled by server.
     :type type: str
     :param connection_string: The connection string. It is mutually exclusive
-     with sasUri property.
-    :type connection_string: ~azure.mgmt.datafactory.models.SecretBase
+     with sasUri property. Type: string, SecureString or
+     AzureKeyVaultSecretReference.
+    :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
@@ -56,7 +57,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'},
     }

diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py
@@ -34,8 +34,9 @@ class AzureStorageLinkedService(LinkedService):
     :param type: Required. Constant filled by server.
     :type type: str
     :param connection_string: The connection string. It is mutually exclusive
-     with sasUri property.
-    :type connection_string: ~azure.mgmt.datafactory.models.SecretBase
+     with sasUri property. Type: string, SecureString or
+     AzureKeyVaultSecretReference.
+    :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
@@ -56,7 +57,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'},
     }