Skip to content

[3.1.6] | Test | Remove AAS - VBS tests from test pipelines (#2474) #2511

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

Merged
merged 2 commits into from
May 17, 2024
Merged

[3.1.6] | Test | Remove AAS - VBS tests from test pipelines (#2474) #2511

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
c313ef5
[3.1.6] | Test | Remove AAS - VBS tests from test pipelines (#2474)
DavoudEshtehari May 16, 2024
aef8af1
Merge remote-tracking branch 'upstream/release/3.1' into Backport/3.1…
DavoudEshtehari May 17, 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
1 change: 0 additions & 1 deletion BUILDGUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ Manual Tests require the below setup to run:
|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;`|
|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;`|
|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};`|
|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};`|
|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;`|
|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};`|
|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 |
Expand Down
7 changes: 0 additions & 7 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public static class DataTestUtility
public static readonly string NPConnectionString = null;
public static readonly string TCPConnectionString = null;
public static readonly string TCPConnectionStringHGSVBS = null;
public static readonly string TCPConnectionStringAASVBS = null;
public static readonly string TCPConnectionStringAASSGX = null;
public static readonly string TCPConnectionStringNoneVBS = null;
public static readonly string AADAuthorityURL = null;
Expand Down Expand Up @@ -77,7 +76,6 @@ static DataTestUtility()
NPConnectionString = c.NPConnectionString;
TCPConnectionString = c.TCPConnectionString;
TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
TCPConnectionStringNoneVBS = c.TCPConnectionStringNoneVBS;
TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
AADAuthorityURL = c.AADAuthorityURL;
Expand Down Expand Up @@ -131,11 +129,6 @@ static DataTestUtility()
AEConnStringsSetup.Add(TCPConnectionStringHGSVBS);
}

if (!string.IsNullOrEmpty(TCPConnectionStringAASVBS))
{
AEConnStrings.Add(TCPConnectionStringAASVBS);
}

if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))
{
AEConnStrings.Add(TCPConnectionStringNoneVBS);
Expand Down
8 changes: 0 additions & 8 deletions ...icrosoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public static class SqlDbManager
private const string TCPConnectionString = "TCPConnectionString";
private const string NPConnectionString = "NPConnectionString";
private const string TCPConnectionStringAASSGX = "TCPConnectionStringAASSGX";
private const string TCPConnectionStringAASVBS = "TCPConnectionStringAASVBS";
private const string TCPConnectionStringHGSVBS = "TCPConnectionStringHGSVBS";

/// <summary>
Expand Down Expand Up @@ -123,10 +122,6 @@ private static void LoadActiveConnectionStrings()
{
s_activeConnectionStrings.Add(TCPConnectionStringAASSGX, s_configJson.TCPConnectionStringAASSGX);
}
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringAASVBS))
{
s_activeConnectionStrings.Add(TCPConnectionStringAASVBS, s_configJson.TCPConnectionStringAASVBS);
}
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringHGSVBS))
{
s_activeConnectionStrings.Add(TCPConnectionStringHGSVBS, s_configJson.TCPConnectionStringHGSVBS);
Expand All @@ -147,9 +142,6 @@ private static void UpdateConfig(string key, SqlConnectionStringBuilder builder)
case TCPConnectionStringAASSGX:
s_configJson.TCPConnectionStringAASSGX = builder.ConnectionString;
break;
case TCPConnectionStringAASVBS:
s_configJson.TCPConnectionStringAASVBS = builder.ConnectionString;
break;
case TCPConnectionStringHGSVBS:
s_configJson.TCPConnectionStringHGSVBS = builder.ConnectionString;
break;
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class Config
public string TCPConnectionString = null;
public string NPConnectionString = null;
public string TCPConnectionStringHGSVBS = null;
public string TCPConnectionStringAASVBS = null;
public string TCPConnectionStringNoneVBS = null;
public string TCPConnectionStringAASSGX = null;
public string AADAuthorityURL = null;
Expand Down
1 change: 0 additions & 1 deletion ...oft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"TCPConnectionString": "Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;",
"NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;",
"TCPConnectionStringHGSVBS": "",
"TCPConnectionStringAASVBS": "",
"TCPConnectionStringNoneVBS": "",
"TCPConnectionStringAASSGX": "",
"EnclaveEnabled": false,
Expand Down