Fix tests (#27)

Author: mikmog

src/backend/Database/Ts.Database.Tests/SharedTestDbFixture.cs

@@ -1,8 +1,8 @@
-using DotNet.Testcontainers.Builders;
-using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Configurations;
 using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Dac;
 using RepoDb;
+using System.Security.Cryptography;
 using Testcontainers.MsSql;
 
 namespace TelemetryStash.Database.Tests;
@@ -17,6 +17,7 @@ public class CollectionState : ICollectionFixture<SharedTestDbFixture>
 public class SharedTestDbFixture : IAsyncLifetime
 {
     private readonly MsSqlContainer _sqlContainer;
+    private readonly string _sqlDbPassword;
     private readonly Dictionary<string, IDbProvider> _dbProviders = [];
     private readonly DacPackage _dacPackage;
 
@@ -27,12 +28,10 @@ public SharedTestDbFixture()
         // https://hub.docker.com/r/microsoft/mssql-server
         _sqlContainer = new MsSqlBuilder()
             .WithImage("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
-
-            // https://github.com/testcontainers/testcontainers-dotnet/issues/1220
-            .WithWaitStrategy(Wait.ForUnixContainer().UntilCommandIsCompleted("/opt/mssql-tools18/bin/sqlcmd", "-C", "-Q", "SELECT 1;"))
             .Build();
 
         _dacPackage = DacPackage.Load("../../../../Ts.TelemetryDatabase.Sql/bin/Ts.TelemetryDatabase.Sql.dacpac");
+        _sqlDbPassword = $"{Convert.ToBase64String(RandomNumberGenerator.GetBytes(10))}-";
     }
 
     public IDbProvider GetTestDbProvider(string databaseName)
@@ -43,29 +42,42 @@ public IDbProvider GetTestDbProvider(string databaseName)
             using var connection = new SqlConnection(masterDbConnectionString);
 
             // Drop database if exist
-            // Drop database if exist
-            const string sql =
-                """
-                    IF DB_ID(@DatabaseName) IS NOT NULL
+            var dropDbSql =
+                $"""
+                    IF DB_ID('{databaseName}') IS NOT NULL
                     BEGIN
-                        DROP DATABASE [@DatabaseName]
+                        DROP DATABASE [{databaseName}]
                     END
                 """;
-                connection.ExecuteScalar(sql, new { DatabaseName = databaseName });
+            connection.ExecuteNonQuery(dropDbSql);
 
-            // Replace master with databaseName
-            var connectionString = new SqlConnectionStringBuilder(masterDbConnectionString)
-            {
-                InitialCatalog = databaseName
-            };
+            // Create database and apply dacpac SQL schema
+            var services = new DacServices(masterDbConnectionString.ToString());
+            services.Deploy(_dacPackage, databaseName);
 
-            var services = new DacServices(connectionString.ToString());
+            // Create user
+            const string userId = "ts_test_user";
+            var createUserSql =
+                $"""
+                    USE [{databaseName}]
 
-            services.Message += (sender, args) => Console.WriteLine(args.Message);
-            services.ProgressChanged += (sender, args) => Console.WriteLine(args.Status);
+                    IF SUSER_ID ('{userId}') IS NULL
+                    CREATE LOGIN [{userId}] WITH PASSWORD = '{_sqlDbPassword}'
 
-            // Create database and apply dacpac SQL schema
-            services.Deploy(_dacPackage, databaseName);
+                    CREATE USER [{userId}] FOR LOGIN [{userId}]
+                    ALTER ROLE [db_execute_procedure_role] ADD MEMBER [{userId}]
+                    EXEC sp_addrolemember 'db_datareader', [{userId}]
+                """;
+
+            connection.ExecuteNonQuery(createUserSql);
+
+            // Build connection string
+            var connectionString = new SqlConnectionStringBuilder(masterDbConnectionString)
+            {
+                InitialCatalog = databaseName,
+                UserID = userId,
+                Password = _sqlDbPassword
+            };
 
             value = new DbProvider(connectionString.ToString());
             _dbProviders[databaseName] = value;

src/backend/Directory.Packages.props

@@ -29,14 +29,14 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0-preview.6.24327.7" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.3.566" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="RepoDb" Version="1.13.1" />
     <PackageVersion Include="RepoDb.SqlServer" Version="1.13.1" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="Testcontainers.MsSql" Version="3.9.0" />
+    <PackageVersion Include="Testcontainers.MsSql" Version="3.10.0" />
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
-</Project>
+</Project>