Skip to content

Commit 80c8de3

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #109 from TransactionProcessing/specflow/#108_nightlyfailure
Nightly Build fixes
2 parents b549652 + e12bf36 commit 80c8de3

14 files changed

Lines changed: 228 additions & 136 deletions

‎FileProcessor.IntegrationTests/Common/DockerHelper.cs‎

Lines changed: 7 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -117,43 +117,6 @@ public DockerHelper(NlogLogger logger, TestingContext testingContext)
117117

118118
#endregion
119119

120-
private async Task LoadEventStoreProjections()
121-
{
122-
//Start our Continous Projections - we might decide to do this at a different stage, but now lets try here
123-
String projectionsFolder = "../../../projections/continuous";
124-
IPAddress[] ipAddresses = Dns.GetHostAddresses("127.0.0.1");
125-
126-
if (!String.IsNullOrWhiteSpace(projectionsFolder))
127-
{
128-
DirectoryInfo di = new DirectoryInfo(projectionsFolder);
129-
130-
if (di.Exists)
131-
{
132-
FileInfo[] files = di.GetFiles();
133-
134-
EventStoreProjectionManagementClient projectionClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings(this.EventStoreHttpPort));
135-
136-
foreach (FileInfo file in files)
137-
{
138-
String projection = File.ReadAllText(file.FullName);
139-
String projectionName = file.Name.Replace(".js", String.Empty);
140-
141-
try
142-
{
143-
Logger.LogInformation($"Creating projection [{projectionName}]");
144-
await projectionClient.CreateContinuousAsync(projectionName, projection, trackEmittedStreams: true).ConfigureAwait(false);
145-
}
146-
catch (Exception e)
147-
{
148-
Logger.LogError(new Exception($"Projection [{projectionName}] error", e));
149-
}
150-
}
151-
}
152-
}
153-
154-
Logger.LogInformation("Loaded projections");
155-
}
156-
157120
#region Methods
158121

159122
public String FileProcessorContainerName;
@@ -318,7 +281,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
318281
this.EstateReportingClient = new EstateReportingClient(EstateReportingBaseAddressResolver, httpClient);
319282
this.FileProcessorClient = new FileProcessorClient(FileProcessorBaseAddressResolver, httpClient);
320283

321-
await this.LoadEventStoreProjections().ConfigureAwait(false);
284+
await this.LoadEventStoreProjections(this.EventStoreHttpPort).ConfigureAwait(false);
322285
}
323286

324287
public const Int32 FileProcessorDockerPort = 5009;
@@ -380,13 +343,12 @@ private IContainerService SetupFileProcessorContainer(String imageName,
380343

381344
public async Task PopulateSubscriptionServiceConfiguration(String estateName)
382345
{
383-
EventStorePersistentSubscriptionsClient client =
384-
new EventStorePersistentSubscriptionsClient(DockerHelper.ConfigureEventStoreSettings(this.EventStoreHttpPort));
385-
386-
PersistentSubscriptionSettings settings = new PersistentSubscriptionSettings(resolveLinkTos: true, StreamPosition.Start);
387-
await client.CreateAsync(estateName.Replace(" ", ""), "Reporting", settings);
388-
await client.CreateAsync($"EstateManagementSubscriptionStream_{estateName.Replace(" ", "")}", "Estate Management", settings);
389-
await client.CreateAsync($"FileProcessorSubscriptionStream_{ReplaceFirst(estateName, " ", "")}", "File Processor", settings);
346+
var name = estateName.Replace(" ", "");
347+
List<(string streamName, string groupName)> subscriptions = new List<(String, String)>();
348+
subscriptions.Add((name, "Reporting"));
349+
subscriptions.Add(($"EstateManagementSubscriptionStream_{name}", "Estate Management"));
350+
subscriptions.Add(($"FileProcessorSubscriptionStream_{name}", "File Processor"));
351+
await this.PopulateSubscriptionServiceConfiguration(this.EventStoreHttpPort, subscriptions);
390352
}
391353

392354
public string ReplaceFirst(string text, string search, string replace)
@@ -398,32 +360,6 @@ public string ReplaceFirst(string text, string search, string replace)
398360
}
399361
return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
400362
}
401-
402-
private static EventStoreClientSettings ConfigureEventStoreSettings(Int32 eventStoreHttpPort)
403-
{
404-
String connectionString = $"http://127.0.0.1:{eventStoreHttpPort}";
405-
406-
EventStoreClientSettings settings = new EventStoreClientSettings();
407-
settings.CreateHttpMessageHandler = () => new SocketsHttpHandler
408-
{
409-
SslOptions =
410-
{
411-
RemoteCertificateValidationCallback = (sender,
412-
certificate,
413-
chain,
414-
errors) => true,
415-
}
416-
};
417-
settings.ConnectionName = "Specflow";
418-
settings.ConnectivitySettings = new EventStoreClientConnectivitySettings
419-
{
420-
Insecure = true,
421-
Address = new Uri(connectionString),
422-
};
423-
424-
settings.DefaultCredentials = new UserCredentials("admin", "changeit");
425-
return settings;
426-
}
427363

428364
private async Task RemoveEstateReadModel()
429365
{

‎FileProcessor.IntegrationTests/Common/Setup.cs‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
namespace FileProcessor.IntegrationTests.Common
22
{
33
using System;
4+
using System.Data;
5+
using System.Data.SqlClient;
6+
using System.Net;
7+
using System.Threading;
8+
using Ductus.FluentDocker.Builders;
49
using Ductus.FluentDocker.Services;
510
using Ductus.FluentDocker.Services.Extensions;
11+
using Microsoft.Extensions.Logging;
612
using NLog;
713
using Shared.Logger;
814
using Shouldly;
915
using TechTalk.SpecFlow;
16+
using ILogger = Microsoft.Extensions.Logging.ILogger;
1017

1118
[Binding]
1219
public class Setup
@@ -20,6 +27,78 @@ public class Setup
2027
public const String SqlUserName = "sa";
2128

2229
public const String SqlPassword = "thisisalongpassword123!";
30+
31+
//public static IContainerService StartSqlContainerWithOpenConnection(String containerName,
32+
// ILogger logger,
33+
// String imageName,
34+
// INetworkService networkService,
35+
// String hostFolder,
36+
// (String URL, String UserName, String Password)? dockerCredentials,
37+
// String sqlUserName = "sa",
38+
// String sqlPassword = "thisisalongpassword123!")
39+
//{
40+
// //logger.LogInformation("About to start SQL Server Container");
41+
// IContainerService databaseServerContainer = new Builder().UseContainer().WithName(containerName).UseImage(imageName)
42+
// .WithEnvironment("ACCEPT_EULA=Y", $"SA_PASSWORD={sqlPassword}").ExposePort(1433)
43+
// .UseNetwork(networkService).KeepContainer().KeepRunning().ReuseIfExists().Build().Start()
44+
// .WaitForPort("1433/tcp", 30000);
45+
46+
// //logger.LogInformation("SQL Server Container Started");
47+
48+
// //logger.LogInformation("About to SQL Server Container is running");
49+
// IPEndPoint sqlServerEndpoint = databaseServerContainer.ToHostExposedEndpoint("1433/tcp");
50+
51+
// // Try opening a connection
52+
// Int32 maxRetries = 10;
53+
// Int32 counter = 1;
54+
55+
// String server = "127.0.0.1";
56+
// String database = "master";
57+
// String user = sqlUserName;
58+
// String password = sqlPassword;
59+
// String port = sqlServerEndpoint.Port.ToString();
60+
61+
// String connectionString = $"server={server},{port};user id={user}; password={password}; database={database};";
62+
// //logger.LogInformation($"Connection String {connectionString}");
63+
// SqlConnection connection = new SqlConnection(connectionString);
64+
65+
// while (counter <= maxRetries)
66+
// {
67+
// try
68+
// {
69+
// //logger.LogInformation($"Database Connection Attempt {counter}");
70+
71+
// connection.Open();
72+
73+
// SqlCommand command = connection.CreateCommand();
74+
// command.CommandText = "SELECT * FROM sys.databases";
75+
// command.ExecuteNonQuery();
76+
77+
// //logger.LogInformation("Connection Opened");
78+
79+
// connection.Close();
80+
// //logger.LogInformation("SQL Server Container Running");
81+
// break;
82+
// }
83+
// catch (SqlException ex)
84+
// {
85+
// if (connection.State == ConnectionState.Open)
86+
// {
87+
// connection.Close();
88+
// }
89+
90+
// //logger.LogError(ex);
91+
// Thread.Sleep(20000);
92+
// }
93+
// finally
94+
// {
95+
// counter++;
96+
// }
97+
// }
98+
99+
// return databaseServerContainer;
100+
//}
101+
23102
[BeforeTestRun]
24103
protected static void GlobalSetup()
25104
{
@@ -35,7 +114,7 @@ protected static void GlobalSetup()
35114
LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);
36115

37116
// Start the Database Server here
38-
Setup.DatabaseServerContainer = global::Shared.IntegrationTesting.DockerHelper.StartSqlContainerWithOpenConnection(Setup.SqlServerContainerName,
117+
Setup.DatabaseServerContainer = Shared.IntegrationTesting.DockerHelper.StartSqlContainerWithOpenConnection(Setup.SqlServerContainerName,
39118
logger,
40119
"mcr.microsoft.com/mssql/server:2019-latest",
41120
Setup.DatabaseServerNetwork,

‎FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)