Skip to content

Commit dd09c64

Browse files
[3.1.6] | Test | Remove AAS - VBS tests from test pipelines (#2474) (#2511)
1 parent 5520453 commit dd09c64

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
@@ -109,7 +109,6 @@ Manual Tests require the below setup to run:
109109
|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;`|
110110
|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;`|
111111
|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};`|
112-
|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};`|
113112
|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;`|
114113
|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};`|
115114
|AADAuthorityURL | (Optional) Identifies the OAuth2 authority resource for `Server` specified in `AADPasswordConnectionString` | `https://login.windows.net/<tenant>`, where `<tenant>` is the tenant ID of the Azure Active Directory (Azure AD) tenant |

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public static class DataTestUtility
2828
public static readonly string NPConnectionString = null;
2929
public static readonly string TCPConnectionString = null;
3030
public static readonly string TCPConnectionStringHGSVBS = null;
31-
public static readonly string TCPConnectionStringAASVBS = null;
3231
public static readonly string TCPConnectionStringAASSGX = null;
3332
public static readonly string TCPConnectionStringNoneVBS = null;
3433
public static readonly string AADAuthorityURL = null;
@@ -77,7 +76,6 @@ static DataTestUtility()
7776
NPConnectionString = c.NPConnectionString;
7877
TCPConnectionString = c.TCPConnectionString;
7978
TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
80-
TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
8179
TCPConnectionStringNoneVBS = c.TCPConnectionStringNoneVBS;
8280
TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
8381
AADAuthorityURL = c.AADAuthorityURL;
@@ -131,11 +129,6 @@ static DataTestUtility()
131129
AEConnStringsSetup.Add(TCPConnectionStringHGSVBS);
132130
}
133131

134-
if (!string.IsNullOrEmpty(TCPConnectionStringAASVBS))
135-
{
136-
AEConnStrings.Add(TCPConnectionStringAASVBS);
137-
}
138-
139132
if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))
140133
{
141134
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>
@@ -123,10 +122,6 @@ private static void LoadActiveConnectionStrings()
123122
{
124123
s_activeConnectionStrings.Add(TCPConnectionStringAASSGX, s_configJson.TCPConnectionStringAASSGX);
125124
}
126-
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringAASVBS))
127-
{
128-
s_activeConnectionStrings.Add(TCPConnectionStringAASVBS, s_configJson.TCPConnectionStringAASVBS);
129-
}
130125
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringHGSVBS))
131126
{
132127
s_activeConnectionStrings.Add(TCPConnectionStringHGSVBS, s_configJson.TCPConnectionStringHGSVBS);
@@ -147,9 +142,6 @@ private static void UpdateConfig(string key, SqlConnectionStringBuilder builder)
147142
case TCPConnectionStringAASSGX:
148143
s_configJson.TCPConnectionStringAASSGX = builder.ConnectionString;
149144
break;
150-
case TCPConnectionStringAASVBS:
151-
s_configJson.TCPConnectionStringAASVBS = builder.ConnectionString;
152-
break;
153145
case TCPConnectionStringHGSVBS:
154146
s_configJson.TCPConnectionStringHGSVBS = builder.ConnectionString;
155147
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;",
33
"NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;",
44
"TCPConnectionStringHGSVBS": "",
5-
"TCPConnectionStringAASVBS": "",
65
"TCPConnectionStringNoneVBS": "",
76
"TCPConnectionStringAASSGX": "",
87
"EnclaveEnabled": false,

0 commit comments

Comments
 (0)