Change connection-string to be object and support making severname, d… (

#2834) * Change connection-string to be object and support making severname, databasename visible to customers * Update description
Azure · Apr 20, 2018 · 7eef9b8 · 7eef9b8
1 parent 759bd28
commit 7eef9b8
Showing 1 changed file with 65 additions and 65 deletions.
diff --git a/...e-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/...e-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
@@ -66,8 +66,8 @@
       "description": "Azure Storage linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string. It is mutually exclusive with sasUri property.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "sasUri": {
           "description": "SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property.",
@@ -103,8 +103,8 @@
       "description": "Azure SQL Data Warehouse linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "servicePrincipalId": {
           "type": "object",
@@ -151,8 +151,8 @@
       "description": "SQL Server linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "userName": {
           "type": "object",
@@ -195,8 +195,8 @@
       "description": "Azure SQL Database linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "servicePrincipalId": {
           "type": "object",
@@ -330,8 +330,8 @@
       "description": "CosmosDB linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "encryptedCredential": {
           "type": "object",
@@ -544,8 +544,8 @@
       "description": "Oracle database linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "encryptedCredential": {
           "type": "object",
@@ -580,8 +580,8 @@
       "description": "Azure MySQL database linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The connection string.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "encryptedCredential": {
           "type": "object",
@@ -926,8 +926,8 @@
       "description": "ODBC linked service properties.",
       "properties": {
         "connectionString": {
-          "description": "The non-access credential portion of the connection string as well as an optional encrypted credential.",
-          "$ref": "../datafactory.json#/definitions/SecretBase"
+          "description": "The non-access credential portion of the connection string as well as an optional encrypted credential. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
         },
         "authenticationType": {
           "type": "object",
@@ -2053,14 +2053,14 @@
       ] 
     }, 
     "AzurePostgreSqlLinkedServiceTypeProperties": { 
-      "description": "Azure PostgreSQL linked service properties.", 
+      "description": "Azure PostgreSQL linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -2143,14 +2143,14 @@
       ] 
     }, 
     "CouchbaseLinkedServiceTypeProperties": { 
-      "description": "Couchbase server linked service properties.", 
+      "description": "Couchbase server linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -2176,14 +2176,14 @@
       ] 
     }, 
     "DrillLinkedServiceTypeProperties": { 
-      "description": "Drill server linked service properties.", 
+      "description": "Drill server linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -2351,14 +2351,14 @@
       ] 
     }, 
     "GreenplumLinkedServiceTypeProperties": { 
-      "description": "Greenplum Database linked service properties.", 
+      "description": "Greenplum Database linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -2845,14 +2845,14 @@
       ] 
     }, 
     "MariaDBLinkedServiceTypeProperties": { 
-      "description": "MariaDB server linked service properties.", 
+      "description": "MariaDB server linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -3639,14 +3639,14 @@
       ] 
     }, 
     "VerticaLinkedServiceTypeProperties": { 
-      "description": "Vertica linked service properties.", 
+      "description": "Vertica linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       } 
@@ -3672,14 +3672,14 @@
       ] 
     }, 
     "NetezzaLinkedServiceTypeProperties": { 
-      "description": "Netezza linked service properties.", 
+      "description": "Netezza linked service properties.",
       "properties": {
-        "connectionString": { 
-          "description": "An ODBC connection string.", 
-          "$ref": "../datafactory.json#/definitions/SecretBase" 
-        }, 
-        "encryptedCredential": { 
-          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", 
+        "connectionString": {
+          "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "encryptedCredential": {
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
           "type": "object"
         }
       }