Light, fluffy, and always free - The AWS Local Emulator alternative
fix(lifecycle): clear storage before services clear on state reset (#3388)
TATSUNO “Taz” Yasuhiro22bae1fcd29a
diff --git a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.javaindex 611a69ddbc..b9ccb8a0f4 100644--- a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java+++ b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java@@ -146,10 +146,12 @@ public class EmulatorInfoController {}private void performReset() {+ // Storage first. Services re-create their bootstrap state in clear(), and a wipe+ // afterwards would remove it again until the next restart.+ storageFactory.clearAll();for (Resettable r : resettables) {r.clear();}- storageFactory.clearAll();}static String resolveVersion() {diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.javaindex 17ff460910..4e850d0b7b 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java@@ -134,6 +134,24 @@ class EmulatorInfoControllerIntegrationTest {.body("status", equalTo("OK"));}+ @Test+ void stateReset_keepsBootstrapStateOfServicesThatReseedOnClear() {+ // IAM Identity Center recreates its bootstrap instance in clear(). A reset that wiped+ // storage after that step left every SCIM call answering 401 until a restart.+ given()+ .when().post("/_floci/state/reset")+ .then()+ .statusCode(200);++ given()+ .header("Authorization", "Bearer floci-scim-token")+ .when()+ .get("/9067f2a3c1-00000000-0000-0000-0000-000000000000/scim/v2/ServiceProviderConfig")+ .then()+ .statusCode(200)+ .body("schemas[0]", equalTo("urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig"));+ }+@Testvoid stateReset_clearsDatabaseState() {// 1. Put SSM parameter