Skip to content

Commit

Permalink
Adding missing secureEnclaves connection parameter to connection inte…
Browse files Browse the repository at this point in the history
…rfaces (#18727)

* adding missing secureEnclaves connection parameter

* adding missing props to tests

* Bumping STS version
  • Loading branch information
Benjin authored Feb 21, 2025
1 parent d0c76b1 commit e66d65c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/configurations/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"service": {
"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
"version": "5.0.20250214.1",
"version": "5.0.20250220.4",
"downloadFileNames": {
"Windows_86": "win-x86-net8.0.zip",
"Windows_64": "win-x64-net8.0.zip",
Expand Down
2 changes: 2 additions & 0 deletions src/models/connectionCredentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export class ConnectionCredentials implements IConnectionInfo {
public trustServerCertificate: boolean | undefined;
public hostNameInCertificate: string | undefined;
public persistSecurityInfo: boolean | undefined;
public secureEnclaves: string | undefined;
public columnEncryptionSetting: string | undefined;
public attestationProtocol: string | undefined;
public enclaveAttestationUrl: string | undefined;
Expand Down Expand Up @@ -86,6 +87,7 @@ export class ConnectionCredentials implements IConnectionInfo {
credentials.hostNameInCertificate;
details.options["persistSecurityInfo"] =
credentials.persistSecurityInfo;
details.options["secureEnclaves"] = credentials.secureEnclaves;
details.options["columnEncryptionSetting"] =
credentials.columnEncryptionSetting;
details.options["attestationProtocol"] =
Expand Down
1 change: 1 addition & 0 deletions test/unit/connectionProfile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function createTestCredentials(): IConnectionInfo {
hostNameInCertificate: "",
persistSecurityInfo: false,
columnEncryptionSetting: "Enabled",
secureEnclaves: "Enabled",
attestationProtocol: "HGS",
enclaveAttestationUrl: "https://attestationurl",
connectTimeout: 15,
Expand Down
1 change: 1 addition & 0 deletions test/unit/perFileConnection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ function createTestCredentials(): IConnectionInfo {
hostNameInCertificate: "",
persistSecurityInfo: false,
columnEncryptionSetting: "enabled",
secureEnclaves: "Enabled",
attestationProtocol: "HGS",
enclaveAttestationUrl: "https://attestationurl",
connectTimeout: 15,
Expand Down
1 change: 1 addition & 0 deletions test/unit/schemaCompareWebViewController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ suite("SchemaCompareWebViewController Tests", () => {
hostNameInCertificate: undefined,
persistSecurityInfo: undefined,
columnEncryptionSetting: undefined,
secureEnclaves: undefined,
attestationProtocol: undefined,
enclaveAttestationUrl: undefined,
commandTimeout: undefined,
Expand Down
5 changes: 5 additions & 0 deletions typings/vscode-mssql.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ declare module 'vscode-mssql' {
*/
persistSecurityInfo: boolean | undefined;

/**
* Gets or sets a value that specifies that Always Encrypted with Secure Enclaves is enabled in a connection.
*/
secureEnclaves: string | undefined;

/**
* Gets or sets a string value that specifies whether Always Encrypted is enabled or disabled for the connection.
*/
Expand Down

0 comments on commit e66d65c

Please sign in to comment.