Change to way SQL Container started

Author: StuartFerguson

Shared.IntegrationTesting/DockerHelper.cs

@@ -425,19 +425,27 @@ public static IContainerService SetupTransactionProcessorContainer(String contai
         /// <param name="networkService">The network service.</param>
         /// <param name="hostFolder">The host folder.</param>
         /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="sqlUserName">Name of the SQL user.</param>
+        /// <param name="sqlPassword">The SQL password.</param>
         /// <returns></returns>
-        public static String StartSqlContainerWithOpenConnection(String containerName,
-                                                                 ILogger logger,
-                                                                 String imageName,
-                                                                 INetworkService networkService,
-                                                                 String hostFolder,
-                                                                 (String URL, String UserName, String Password)? dockerCredentials)
+        public static IContainerService StartSqlContainerWithOpenConnection(String containerName,
+                                                                            ILogger logger,
+                                                                            String imageName,
+                                                                            INetworkService networkService,
+                                                                            String hostFolder,
+                                                                            (String URL, String UserName, String Password)? dockerCredentials,
+                                                                            String sqlUserName = "sa",
+                                                                            String sqlPassword = "thisisalongpassword123!")
         {
+            logger.LogInformation("About to start SQL Server Container");
             IContainerService databaseServerContainer = new Builder().UseContainer().WithName(containerName).UseImage(imageName)
-                                                                     .WithEnvironment("ACCEPT_EULA=Y", "SA_PASSWORD=thisisalongpassword123!").ExposePort(1433)
+                                                                     .WithEnvironment("ACCEPT_EULA=Y", "SA_PASSWORD={sqlPassword}").ExposePort(1433)
                                                                      .UseNetwork(networkService).KeepContainer().KeepRunning().ReuseIfExists().Build().Start()
                                                                      .WaitForPort("1433/tcp", 30000);
 
+            logger.LogInformation("SQL Server Container Started");
+
+            logger.LogInformation("About to SQL Server Container is running");
             IPEndPoint sqlServerEndpoint = databaseServerContainer.ToHostExposedEndpoint("1433/tcp");
 
             // Try opening a connection
@@ -446,53 +454,49 @@ public static String StartSqlContainerWithOpenConnection(String containerName,
 
             String server = "127.0.0.1";
             String database = "SubscriptionServiceConfiguration";
-            String user = "sa";
-            String password = "thisisalongpassword123!";
+            String user = sqlUserName;
+            String password = sqlPassword;
             String port = sqlServerEndpoint.Port.ToString();
 
             String connectionString = $"server={server},{port};user id={user}; password={password}; database={database};";
-
+            logger.LogInformation($"Connection String {connectionString}");
             SqlConnection connection = new SqlConnection(connectionString);
 
-            using(StreamWriter sw = new StreamWriter("C:\\Temp\\testlog.log", true))
+            while (counter <= maxRetries)
             {
-                while (counter <= maxRetries)
+                try
                 {
-                    try
-                    {
-                        sw.WriteLine($"Attempt {counter}");
-                        sw.WriteLine(DateTime.Now);
+                    logger.LogInformation($"Database Connection Attempt {counter}");
 
-                        connection.Open();
+                    connection.Open();
 
-                        SqlCommand command = connection.CreateCommand();
-                        command.CommandText = "SELECT * FROM EventStoreServers";
-                        command.ExecuteNonQuery();
+                    SqlCommand command = connection.CreateCommand();
+                    command.CommandText = "SELECT * FROM EventStoreServers";
+                    command.ExecuteNonQuery();
 
-                        sw.WriteLine("Connection Opened");
+                    logger.LogInformation("Connection Opened");
 
+                    connection.Close();
+                    logger.LogInformation("SQL Server Container Running");
+                    break;
+                }
+                catch(SqlException ex)
+                {
+                    if (connection.State == ConnectionState.Open)
+                    {
                         connection.Close();
-
-                        break;
                     }
-                    catch(SqlException ex)
-                    {
-                        if (connection.State == ConnectionState.Open)
-                        {
-                            connection.Close();
-                        }
 
-                        sw.WriteLine(ex);
-                        Thread.Sleep(20000);
-                    }
-                    finally
-                    {
-                        counter++;
-                    }
+                    logger.LogError(ex);
+                    Thread.Sleep(20000);
+                }
+                finally
+                {
+                    counter++;
                 }
             }
 
-            return $"server={containerName};user id={user}; password={password};";
+            return databaseServerContainer;
         }
 
         /// <summary>