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

Update encryption option strings in ADS connection dialog #25311

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Update encryption option strings in ADS connection dialog #25311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a36f55
update encryption options strings
kisantia Feb 8, 2024
7332bd2
update order
kisantia Feb 8, 2024
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
8 changes: 4 additions & 4 deletions extensions/cms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,17 +364,17 @@
"defaultValue": "true",
"objectType": null,
"categoryValues": [
{
"displayName": "%cms.connectionOptions.encrypt.categoryValues.false%",
"name": "false"
},
{
"displayName": "%cms.connectionOptions.encrypt.categoryValues.true%",
"name": "true"
},
{
"displayName": "%cms.connectionOptions.encrypt.categoryValues.strict%",
"name": "strict"
},
{
"displayName": "%cms.connectionOptions.encrypt.categoryValues.false%",
"name": "false"
}
],
"isRequired": false,
Expand Down
6 changes: 3 additions & 3 deletions extensions/cms/package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
"cms.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
"cms.connectionOptions.encrypt.displayName": "Encrypt",
"cms.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
"cms.connectionOptions.encrypt.categoryValues.strict": "Strict",
"cms.connectionOptions.encrypt.categoryValues.true": "Mandatory (True)",
"cms.connectionOptions.encrypt.categoryValues.false": "Optional (False)",
"cms.connectionOptions.encrypt.categoryValues.strict": "Strict (supported for SQL Server 2022 and Azure SQL)",
"cms.connectionOptions.encrypt.categoryValues.true": "Mandatory",
"cms.connectionOptions.encrypt.categoryValues.false": "Optional",
"cms.connectionOptions.persistSecurityInfo.displayName": "Persist security info",
"cms.connectionOptions.persistSecurityInfo.description": "When false, security-sensitive information, such as the password, is not returned as part of the connection",
"cms.connectionOptions.hostNameInCertificate.displayName": "Host name in certificate",
Expand Down
8 changes: 4 additions & 4 deletions extensions/mssql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,17 +1418,17 @@
"defaultValue": "true",
"objectType": null,
"categoryValues": [
{
"displayName": "%mssql.connectionOptions.encrypt.categoryValues.false%",
"name": "false"
},
{
"displayName": "%mssql.connectionOptions.encrypt.categoryValues.true%",
"name": "true"
},
{
"displayName": "%mssql.connectionOptions.encrypt.categoryValues.strict%",
"name": "strict"
},
{
"displayName": "%mssql.connectionOptions.encrypt.categoryValues.false%",
"name": "false"
}
],
"isRequired": false,
Expand Down
6 changes: 3 additions & 3 deletions extensions/mssql/package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@
"mssql.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
"mssql.connectionOptions.encrypt.displayName": "Encrypt",
"mssql.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
"mssql.connectionOptions.encrypt.categoryValues.strict": "Strict",
"mssql.connectionOptions.encrypt.categoryValues.true": "Mandatory (True)",
"mssql.connectionOptions.encrypt.categoryValues.false": "Optional (False)",
"mssql.connectionOptions.encrypt.categoryValues.strict": "Strict (supported for SQL Server 2022 and Azure SQL)",
"mssql.connectionOptions.encrypt.categoryValues.true": "Mandatory",
"mssql.connectionOptions.encrypt.categoryValues.false": "Optional",
"mssql.connectionOptions.persistSecurityInfo.displayName": "Persist security info",
"mssql.connectionOptions.persistSecurityInfo.description": "When false, security-sensitive information, such as the password, is not returned as part of the connection",
"mssql.connectionOptions.hostNameInCertificate.displayName": "Host name in certificate",
Expand Down