Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(rds): restore persisted runtime on startup (#1071)

Albert Einshutoin4125b9fc5a78
diff --git a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java
index 93b8ec9ff7..522ffeba4c 100644
--- a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java
+++ b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java
@@ -14,6 +14,7 @@ import io.github.hectorvent.floci.services.lambda.DynamoDbStreamsEventSourcePoll
import io.github.hectorvent.floci.services.lambda.KinesisEventSourcePoller;
import io.github.hectorvent.floci.services.lambda.SqsEventSourcePoller;
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;
import io.github.hectorvent.floci.services.rds.proxy.RdsProxyManager;
import io.quarkus.runtime.Quarkus;
@@ -49,6 +50,7 @@ public class EmulatorLifecycle {
private final ElastiCacheProxyManager elastiCacheProxyManager;
private final RdsContainerManager rdsContainerManager;
private final RdsProxyManager rdsProxyManager;
+ private final RdsService rdsService;
private final InitializationHooksRunner initializationHooksRunner;
private final SqsEventSourcePoller sqsPoller;
private final KinesisEventSourcePoller kinesisPoller;
@@ -66,6 +68,7 @@ public class EmulatorLifecycle {
ElastiCacheProxyManager elastiCacheProxyManager,
RdsContainerManager rdsContainerManager,
RdsProxyManager rdsProxyManager,
+ RdsService rdsService,
InitializationHooksRunner initializationHooksRunner,
SqsEventSourcePoller sqsPoller,
KinesisEventSourcePoller kinesisPoller,
@@ -82,6 +85,7 @@ public class EmulatorLifecycle {
this.elastiCacheProxyManager = elastiCacheProxyManager;
this.rdsContainerManager = rdsContainerManager;
this.rdsProxyManager = rdsProxyManager;
+ this.rdsService = rdsService;
this.initializationHooksRunner = initializationHooksRunner;
this.sqsPoller = sqsPoller;
this.kinesisPoller = kinesisPoller;
@@ -117,6 +121,7 @@ public class EmulatorLifecycle {
kinesisPoller.startPersistedPollers();
dynamodbStreamsPoller.startPersistedPollers();
pipesService.startPersistedPollers();
+ rdsService.restorePersistedRuntime();
if (config.services().ec2().enabled() && !config.services().ec2().mock()) {
ec2MetadataServer.start().exceptionally(ex -> {
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
index ec3b691a3b..edf943d29d 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
@@ -18,7 +18,6 @@ import io.github.hectorvent.floci.services.rds.model.DbInstance;
import io.github.hectorvent.floci.services.rds.model.DbInstanceStatus;
import io.github.hectorvent.floci.services.rds.model.DbParameterGroup;
import io.github.hectorvent.floci.services.rds.proxy.RdsProxyManager;
-import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.jboss.logging.Logger;
@@ -89,8 +88,7 @@ public class RdsService {
this.clusterParameterGroups = clusterParameterGroups;
}
- @PostConstruct
- void restorePersistedRuntime() {
+ public void restorePersistedRuntime() {
restoreClusters();
restoreInstances();
}
diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java
index 2ce6b57b3a..cb310dfa53 100644
--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java
+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java
@@ -15,6 +15,7 @@ import io.github.hectorvent.floci.services.lambda.SqsEventSourcePoller;
import io.github.hectorvent.floci.services.ec2.Ec2MetadataServer;
import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;
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;
import io.github.hectorvent.floci.services.rds.proxy.RdsProxyManager;
import io.quarkus.runtime.ShutdownDelayInitiatedEvent;
@@ -51,6 +52,7 @@ class EmulatorLifecycleTest {
@Mock private ElastiCacheProxyManager elastiCacheProxyManager;
@Mock private RdsContainerManager rdsContainerManager;
@Mock private RdsProxyManager rdsProxyManager;
+ @Mock private RdsService rdsService;
@Mock private InitializationHooksRunner initializationHooksRunner;
@Mock private SqsEventSourcePoller sqsPoller;
@Mock private KinesisEventSourcePoller kinesisPoller;
@@ -74,7 +76,7 @@ class EmulatorLifecycleTest {
emulatorLifecycle = new EmulatorLifecycle(
storageFactory, serviceRegistry, config,
elastiCacheContainerManager, elastiCacheMemcachedContainerManager,
- elastiCacheProxyManager, rdsContainerManager, rdsProxyManager,
+ elastiCacheProxyManager, rdsContainerManager, rdsProxyManager, rdsService,
initializationHooksRunner, sqsPoller, kinesisPoller, dynamodbStreamsPoller,
pipesService, ec2MetadataServer, ecrRegistryManager, initLifecycleState);
}
@@ -94,10 +96,11 @@ class EmulatorLifecycleTest {
emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));
- var inOrder = Mockito.inOrder(initializationHooksRunner, storageFactory, initLifecycleState);
+ var inOrder = Mockito.inOrder(initializationHooksRunner, storageFactory, initLifecycleState, rdsService);
inOrder.verify(initializationHooksRunner).run(InitializationHook.BOOT);
inOrder.verify(initLifecycleState).markBootCompleted();
inOrder.verify(storageFactory).loadAll();
+ inOrder.verify(rdsService).restorePersistedRuntime();
}
@Test