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

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

Merged
merged 2 commits into from
Apr 20, 2018
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a4a7d3
Change connection-string to be object and support making severname, d…
zhanyu2024 Apr 8, 2018
a3865a4
Update description
zhanyu2024 Apr 10, 2018
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
130 changes: 65 additions & 65 deletions ...e-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -968,8 +968,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",
Expand Down Expand Up @@ -2095,14 +2095,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"
}
}
Expand Down Expand Up @@ -2185,14 +2185,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"
}
}
Expand All @@ -2218,14 +2218,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"
}
}
Expand Down Expand Up @@ -2393,14 +2393,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"
}
}
Expand Down Expand Up @@ -2887,14 +2887,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"
}
}
Expand Down Expand Up @@ -3681,14 +3681,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"
}
}
Expand All @@ -3714,14 +3714,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"
}
}
Expand Down