Skip to content

Commit 55d30c7

Browse files
author
Javad Rahnama
authored
Test | Remove AAS - VBS tests from test pipelines (#2474)
1 parent 48ab625 commit 55d30c7

File tree

5 files changed

+0
-18
lines changed

5 files changed

+0
-18
lines changed

BUILDGUIDE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ Manual Tests require the below setup to run:
165165
|TCPConnectionString | Connection String for a TCP enabled SQL Server instance. | `Server={servername};Database={Database_Name};Trusted_Connection=True;` <br/> OR `Data Source={servername};Initial Catalog={Database_Name};Integrated Security=True;`|
166166
|NPConnectionString | Connection String for a Named Pipes enabled SQL Server instance.| `Server=\\{servername}\pipe\sql\query;Database={Database_Name};Trusted_Connection=True;` <br/> OR <br/> `Data Source=np:{servername};Initial Catalog={Database_Name};Integrated Security=True;`|
167167
|TCPConnectionStringHGSVBS | (Optional) Connection String for a TCP enabled SQL Server with Host Guardian Service (HGS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = HGS; Enclave Attestation Url = {AttestationURL};`|
168-
|TCPConnectionStringAASVBS | (Optional) Connection String for a TCP enabled SQL Server with a VBS Enclave and using Microsoft Azure Attestation (AAS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = AAS; Enclave Attestation Url = {AttestationURL};`|
169168
|TCPConnectionStringNoneVBS | (Optional) Connection String for a TCP enabled SQL Server with a VBS Enclave and using None Attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = NONE;`|
170169
|TCPConnectionStringAASSGX | (Optional) Connection String for a TCP enabled SQL Server with a SGX Enclave and using Microsoft Azure Attestation (AAS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = AAS; Enclave Attestation Url = {AttestationURL};`|
171170
|EnclaveEnabled | Enables tests requiring an enclave-configured server.|

src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public static class DataTestUtility
3232
public static readonly string NPConnectionString = null;
3333
public static readonly string TCPConnectionString = null;
3434
public static readonly string TCPConnectionStringHGSVBS = null;
35-
public static readonly string TCPConnectionStringAASVBS = null;
3635
public static readonly string TCPConnectionStringNoneVBS = null;
3736
public static readonly string TCPConnectionStringAASSGX = null;
3837
public static readonly string AADAuthorityURL = null;
@@ -144,7 +143,6 @@ static DataTestUtility()
144143
NPConnectionString = c.NPConnectionString;
145144
TCPConnectionString = c.TCPConnectionString;
146145
TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
147-
TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
148146
TCPConnectionStringNoneVBS = c.TCPConnectionStringNoneVBS;
149147
TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
150148
AADAuthorityURL = c.AADAuthorityURL;
@@ -203,11 +201,6 @@ static DataTestUtility()
203201
AEConnStringsSetup.Add(TCPConnectionStringHGSVBS);
204202
}
205203

206-
if (!string.IsNullOrEmpty(TCPConnectionStringAASVBS))
207-
{
208-
AEConnStrings.Add(TCPConnectionStringAASVBS);
209-
}
210-
211204
if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))
212205
{
213206
AEConnStrings.Add(TCPConnectionStringNoneVBS);

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public static class SqlDbManager
2424
private const string TCPConnectionString = "TCPConnectionString";
2525
private const string NPConnectionString = "NPConnectionString";
2626
private const string TCPConnectionStringAASSGX = "TCPConnectionStringAASSGX";
27-
private const string TCPConnectionStringAASVBS = "TCPConnectionStringAASVBS";
2827
private const string TCPConnectionStringHGSVBS = "TCPConnectionStringHGSVBS";
2928

3029
/// <summary>
@@ -124,10 +123,6 @@ private static void LoadActiveConnectionStrings()
124123
{
125124
s_activeConnectionStrings.Add(TCPConnectionStringAASSGX, s_configJson.TCPConnectionStringAASSGX);
126125
}
127-
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringAASVBS))
128-
{
129-
s_activeConnectionStrings.Add(TCPConnectionStringAASVBS, s_configJson.TCPConnectionStringAASVBS);
130-
}
131126
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringHGSVBS))
132127
{
133128
s_activeConnectionStrings.Add(TCPConnectionStringHGSVBS, s_configJson.TCPConnectionStringHGSVBS);
@@ -148,9 +143,6 @@ private static void UpdateConfig(string key, SqlConnectionStringBuilder builder)
148143
case TCPConnectionStringAASSGX:
149144
s_configJson.TCPConnectionStringAASSGX = builder.ConnectionString;
150145
break;
151-
case TCPConnectionStringAASVBS:
152-
s_configJson.TCPConnectionStringAASVBS = builder.ConnectionString;
153-
break;
154146
case TCPConnectionStringHGSVBS:
155147
s_configJson.TCPConnectionStringHGSVBS = builder.ConnectionString;
156148
break;

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class Config
1313
public string TCPConnectionString = null;
1414
public string NPConnectionString = null;
1515
public string TCPConnectionStringHGSVBS = null;
16-
public string TCPConnectionStringAASVBS = null;
1716
public string TCPConnectionStringNoneVBS = null;
1817
public string TCPConnectionStringAASSGX = null;
1918
public string AADAuthorityURL = null;

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"TCPConnectionString": "Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
33
"NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
44
"TCPConnectionStringHGSVBS": "",
5-
"TCPConnectionStringAASVBS": "",
65
"TCPConnectionStringNoneVBS": "",
76
"TCPConnectionStringAASSGX": "",
87
"EnclaveEnabled": false,

0 commit comments

Comments
 (0)