Light, fluffy, and always free - The AWS Local Emulator alternative
fix(docdb,neptune): stop containers and proxies on emulator shutdown (#1452)
Ahmed khaled8e23e740e7b2
diff --git a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.javaindex 9b1d6fd93f..f34b7b09ff 100644--- a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java+++ b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java@@ -11,9 +11,12 @@ import io.github.hectorvent.floci.services.floci.ui.FlociUiManager;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheContainerManager;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheMemcachedContainerManager;import io.github.hectorvent.floci.services.elasticache.proxy.ElastiCacheProxyManager;+import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;import io.github.hectorvent.floci.services.lambda.DynamoDbStreamsEventSourcePoller;import io.github.hectorvent.floci.services.lambda.KinesisEventSourcePoller;import io.github.hectorvent.floci.services.lambda.SqsEventSourcePoller;+import io.github.hectorvent.floci.services.neptune.container.NeptuneContainerManager;+import io.github.hectorvent.floci.services.neptune.proxy.NeptuneProxyManager;import io.github.hectorvent.floci.services.pipes.PipesService;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.rds.container.RdsContainerManager;@@ -59,6 +62,9 @@ public class EmulatorLifecycle {private final ElastiCacheProxyManager elastiCacheProxyManager;private final RdsContainerManager rdsContainerManager;private final RdsProxyManager rdsProxyManager;+ private final DocDbContainerManager docDbContainerManager;+ private final NeptuneContainerManager neptuneContainerManager;+ private final NeptuneProxyManager neptuneProxyManager;private final RdsService rdsService;private final InitializationHooksRunner initializationHooksRunner;private final SqsEventSourcePoller sqsPoller;@@ -78,6 +84,9 @@ public class EmulatorLifecycle {ElastiCacheProxyManager elastiCacheProxyManager,RdsContainerManager rdsContainerManager,RdsProxyManager rdsProxyManager,+ DocDbContainerManager docDbContainerManager,+ NeptuneContainerManager neptuneContainerManager,+ NeptuneProxyManager neptuneProxyManager,RdsService rdsService,InitializationHooksRunner initializationHooksRunner,SqsEventSourcePoller sqsPoller,@@ -96,6 +105,9 @@ public class EmulatorLifecycle {this.elastiCacheProxyManager = elastiCacheProxyManager;this.rdsContainerManager = rdsContainerManager;this.rdsProxyManager = rdsProxyManager;+ this.docDbContainerManager = docDbContainerManager;+ this.neptuneContainerManager = neptuneContainerManager;+ this.neptuneProxyManager = neptuneProxyManager;this.rdsService = rdsService;this.initializationHooksRunner = initializationHooksRunner;this.sqsPoller = sqsPoller;@@ -218,9 +230,12 @@ public class EmulatorLifecycle {}elastiCacheProxyManager.stopAll();rdsProxyManager.stopAll();+ neptuneProxyManager.stopAll();elastiCacheContainerManager.stopAll();elastiCacheMemcachedContainerManager.stopAll();rdsContainerManager.stopAll();+ docDbContainerManager.stopAll();+ neptuneContainerManager.stopAll();ecrRegistryManager.shutdown();flociUiManager.shutdown();storageFactory.shutdownAll();diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.javaindex a997061ed7..91251e303a 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java@@ -9,6 +9,9 @@ import io.github.hectorvent.floci.lifecycle.inithook.InitializationHooksRunner;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheContainerManager;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheMemcachedContainerManager;import io.github.hectorvent.floci.services.elasticache.proxy.ElastiCacheProxyManager;+import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;+import io.github.hectorvent.floci.services.neptune.container.NeptuneContainerManager;+import io.github.hectorvent.floci.services.neptune.proxy.NeptuneProxyManager;import io.github.hectorvent.floci.services.lambda.DynamoDbStreamsEventSourcePoller;import io.github.hectorvent.floci.services.lambda.KinesisEventSourcePoller;import io.github.hectorvent.floci.services.lambda.SqsEventSourcePoller;@@ -57,6 +60,9 @@ class EmulatorLifecycleTest {@Mock private ElastiCacheProxyManager elastiCacheProxyManager;@Mock private RdsContainerManager rdsContainerManager;@Mock private RdsProxyManager rdsProxyManager;+ @Mock private DocDbContainerManager docDbContainerManager;+ @Mock private NeptuneContainerManager neptuneContainerManager;+ @Mock private NeptuneProxyManager neptuneProxyManager;@Mock private RdsService rdsService;@Mock private InitializationHooksRunner initializationHooksRunner;@Mock private SqsEventSourcePoller sqsPoller;@@ -82,7 +88,8 @@ class EmulatorLifecycleTest {emulatorLifecycle = new EmulatorLifecycle(storageFactory, serviceRegistry, config,elastiCacheContainerManager, elastiCacheMemcachedContainerManager,- elastiCacheProxyManager, rdsContainerManager, rdsProxyManager, rdsService,+ elastiCacheProxyManager, rdsContainerManager, rdsProxyManager,+ docDbContainerManager, neptuneContainerManager, neptuneProxyManager, rdsService,initializationHooksRunner, sqsPoller, kinesisPoller, dynamodbStreamsPoller,pipesService, ec2MetadataServer, ecrRegistryManager, flociUiManager, initLifecycleState);}@@ -197,6 +204,7 @@ class EmulatorLifecycleTest {verify(storageFactory, never()).shutdownAll();verify(elastiCacheProxyManager, never()).stopAll();verify(rdsProxyManager, never()).stopAll();+ verify(neptuneProxyManager, never()).stopAll();}@Test@@ -244,8 +252,11 @@ class EmulatorLifecycleTest {verify(elastiCacheProxyManager).stopAll();verify(rdsProxyManager).stopAll();+ verify(neptuneProxyManager).stopAll();verify(elastiCacheContainerManager).stopAll();verify(rdsContainerManager).stopAll();+ verify(docDbContainerManager).stopAll();+ verify(neptuneContainerManager).stopAll();verify(storageFactory).shutdownAll();// Hooks are handled by onPreShutdown, never from ShutdownEvent.verify(initializationHooksRunner, never()).run(InitializationHook.STOP);@@ -262,8 +273,11 @@ class EmulatorLifecycleTest {verify(initializationHooksRunner).run(InitializationHook.STOP);verify(elastiCacheProxyManager).stopAll();verify(rdsProxyManager).stopAll();+ verify(neptuneProxyManager).stopAll();verify(elastiCacheContainerManager).stopAll();verify(rdsContainerManager).stopAll();+ verify(docDbContainerManager).stopAll();+ verify(neptuneContainerManager).stopAll();verify(storageFactory).shutdownAll();}