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

…2510)
dotnet · May 17, 2024 · 3eb855e · 3eb855e
1 parent 2ec2e72
commit 3eb855e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
@@ -163,7 +163,8 @@ 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};`|
-  |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 |
+  |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 |
   |AADPasswordConnectionString | (Optional) Connection String for testing Azure Active Directory Password Authentication. | `Data Source={server.database.windows.net}; Initial Catalog={Azure_DB_Name};Authentication=Active Directory Password; User ID={AAD_User}; Password={AAD_User_Password};`|
   |AADSecurePrincipalId | (Optional) The Application Id of a registered application which has been granted permission to the database defined in the AADPasswordConnectionString. | {Application ID} |
   |AADSecurePrincipalSecret | (Optional) A Secret defined for a registered application which has been granted permission to the database defined in the AADPasswordConnectionString. | {Secret} |

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -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 AADAuthorityURL = null;
         public static readonly string AADPasswordConnectionString = null;
@@ -85,7 +84,6 @@ static DataTestUtility()
             NPConnectionString = c.NPConnectionString;
             TCPConnectionString = c.TCPConnectionString;
             TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
-            TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
             TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
             AADAuthorityURL = c.AADAuthorityURL;
             AADPasswordConnectionString = c.AADPasswordConnectionString;
@@ -141,11 +139,6 @@ static DataTestUtility()
                     AEConnStringsSetup.Add(TCPConnectionStringHGSVBS);
                 }
 
-                if (!string.IsNullOrEmpty(TCPConnectionStringAASVBS))
-                {
-                    AEConnStrings.Add(TCPConnectionStringAASVBS);
-                }
-
                 if (!string.IsNullOrEmpty(TCPConnectionStringAASSGX))
                 {
                     AEConnStrings.Add(TCPConnectionStringAASSGX);

diff --git a/...icrosoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs b/...icrosoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
@@ -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>
@@ -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);
@@ -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;

diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
@@ -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 TCPConnectionStringAASSGX = null;
         public string AADAuthorityURL = null;
         public string AADPasswordConnectionString = null;

diff --git a/...oft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json b/...oft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
@@ -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": "",
     "TCPConnectionStringAASSGX": "",
     "EnclaveEnabled": false,
     "TracingEnabled": false,