diff --git a/Shared.IntegrationTesting.Tests/GenericSteps.cs b/Shared.IntegrationTesting.Tests/GenericSteps.cs index 12f3de0..66d0909 100644 --- a/Shared.IntegrationTesting.Tests/GenericSteps.cs +++ b/Shared.IntegrationTesting.Tests/GenericSteps.cs @@ -46,7 +46,7 @@ public async Task StartSystem() { DockerServices services = DockerServices.EventStore | DockerServices.MessagingService | DockerServices.SecurityService | DockerServices.CallbackHandler | DockerServices.FileProcessor | DockerServices.TestHost | DockerServices.TransactionProcessor | - DockerServices.TransactionProcessorAcl | DockerServices.KeyCloak; + DockerServices.TransactionProcessorAcl; this.TestingContext.Logger = logger; this.TestingContext.Logger.LogInformation("About to Start Containers for Scenario Run"); diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs index bf00686..3611253 100644 --- a/Shared.IntegrationTesting/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/BaseDockerHelper.cs @@ -109,9 +109,6 @@ public abstract class BaseDockerHelper{ protected Int32 TransactionProcessorAclPort; - protected String KeyCloakContainerName; - protected Int32 KeyCloakPort; - protected String TransactionProcessorContainerName; protected Int32 TransactionProcessorPort; @@ -149,7 +146,6 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) { this.ImageDetails.Add(ContainerType.TransactionProcessor, ("stuartferguson/transactionprocessorwindows:master", true)); this.ImageDetails.Add(ContainerType.FileProcessor, ("stuartferguson/fileprocessorwindows:master", true)); this.ImageDetails.Add(ContainerType.TransactionProcessorAcl, ("stuartferguson/transactionprocessoraclwindows:master", true)); - this.ImageDetails.Add(ContainerType.Keycloak, ("quay.io/keycloak/keycloak:26.4.1", true)); // Note: this may not work... } else{ if (FdOs.IsLinux()){ @@ -167,7 +163,6 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) { this.ImageDetails.Add(ContainerType.TransactionProcessor, ("stuartferguson/transactionprocessor:master", true)); this.ImageDetails.Add(ContainerType.FileProcessor, ("stuartferguson/fileprocessor:master", true)); this.ImageDetails.Add(ContainerType.TransactionProcessorAcl, ("stuartferguson/transactionprocessoracl:master", true)); - this.ImageDetails.Add(ContainerType.Keycloak, ("quay.io/keycloak/keycloak:26.4.1", true)); } this.HostPorts = new Dictionary(); @@ -325,7 +320,6 @@ public virtual void SetupContainerNames(){ this.MessagingServiceContainerName = $"messaging{this.TestId:N}"; this.TransactionProcessorContainerName = $"transaction{this.TestId:N}"; this.TransactionProcessorAclContainerName = $"transactionacl{this.TestId:N}"; - this.KeyCloakContainerName= $"keycloak{this.TestId:N}"; } public virtual ContainerBuilder SetupEventStoreContainer(){ @@ -373,23 +367,7 @@ public virtual ContainerBuilder SetupEventStoreContainer(){ return eventStoreContainerBuilder; } - - public virtual ContainerBuilder SetupKeycloakContainer() - { - this.Trace("About to Start KeyCloak Container"); - - List environmentVariables = new(); - environmentVariables.Add("KC_BOOTSTRAP_ADMIN_USERNAME=admin"); - environmentVariables.Add("KC_BOOTSTRAP_ADMIN_PASSWORD=admin"); - - ContainerBuilder keycloakContainer = new Builder().UseContainer() - .WithName(this.KeyCloakContainerName).WithEnvironment(environmentVariables.ToArray()) - .UseImageDetails(this.GetImageDetails(ContainerType.Keycloak).Data).ExposePort(DockerPorts.KeyCloakDockerPort) - .Command("start-dev"); // 👈 equivalent to `docker run ... start-dev` - - return keycloakContainer; - } - + public virtual ContainerBuilder SetupFileProcessorContainer(){ this.Trace("About to Start File Processor Container"); @@ -956,7 +934,6 @@ protected async Task StartContainer2(Func b DockerServices.TransactionProcessorAcl => ContainerType.TransactionProcessorAcl, DockerServices.EventStore=> ContainerType.EventStore, DockerServices.SqlServer => ContainerType.SqlServer, - DockerServices.KeyCloak => ContainerType.Keycloak, _ => ContainerType.NotSet }; @@ -1032,9 +1009,6 @@ Int32 GetPort(Int32 dockerPort) => case ContainerType.TransactionProcessorAcl: TransactionProcessorAclPort = GetPort(DockerPorts.TransactionProcessorAclDockerPort); break; - case ContainerType.Keycloak: - this.KeyCloakPort = GetPort(DockerPorts.KeyCloakDockerPort); - break; } } diff --git a/Shared.IntegrationTesting/ContainerType.cs b/Shared.IntegrationTesting/ContainerType.cs index 71c03bd..7035ecd 100644 --- a/Shared.IntegrationTesting/ContainerType.cs +++ b/Shared.IntegrationTesting/ContainerType.cs @@ -11,6 +11,5 @@ public enum ContainerType TransactionProcessor, FileProcessor, TransactionProcessorAcl, - Keycloak, NotSet } \ No newline at end of file diff --git a/Shared.IntegrationTesting/DockerHelper.cs b/Shared.IntegrationTesting/DockerHelper.cs index b0d4055..974a214 100644 --- a/Shared.IntegrationTesting/DockerHelper.cs +++ b/Shared.IntegrationTesting/DockerHelper.cs @@ -32,8 +32,7 @@ public enum DockerServices{ TestHost = 32, TransactionProcessor = 64, FileProcessor = 128, - TransactionProcessorAcl = 256, - KeyCloak = 512 + TransactionProcessorAcl = 256 } public abstract class DockerHelper : BaseDockerHelper @@ -123,7 +122,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do await StartContainer2(this.SetupTransactionProcessorContainer, networks, DockerServices.TransactionProcessor); await StartContainer2(this.SetupFileProcessorContainer, networks, DockerServices.FileProcessor); await StartContainer2(this.SetupTransactionProcessorAclContainer, networks, DockerServices.TransactionProcessorAcl); - await StartContainer2(this.SetupKeycloakContainer, networks, DockerServices.KeyCloak); await this.LoadEventStoreProjections(); diff --git a/Shared.IntegrationTesting/DockerPorts.cs b/Shared.IntegrationTesting/DockerPorts.cs index 8313af5..a7564e8 100644 --- a/Shared.IntegrationTesting/DockerPorts.cs +++ b/Shared.IntegrationTesting/DockerPorts.cs @@ -21,6 +21,4 @@ public static class DockerPorts public static readonly Int32 TransactionProcessorAclDockerPort = 5003; public static readonly Int32 TransactionProcessorDockerPort = 5002; - - public static readonly Int32 KeyCloakDockerPort = 8080; } \ No newline at end of file