Light, fluffy, and always free - The AWS Local Emulator alternative
fix(test): disable the GuardDuty organization admin GuardDutyMembersIntegrationTest enables (#3348)
Kenshin Okinaka3669c8e84ce2
diff --git a/src/test/java/io/github/hectorvent/floci/services/guardduty/GuardDutyMembersIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/guardduty/GuardDutyMembersIntegrationTest.javaindex 63c2104166..a2998d0271 100644--- a/src/test/java/io/github/hectorvent/floci/services/guardduty/GuardDutyMembersIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/guardduty/GuardDutyMembersIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.guardduty;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -11,11 +12,32 @@ import static org.hamcrest.Matchers.hasSize;@QuarkusTestclass GuardDutyMembersIntegrationTest {+ private boolean enabledOrganizationAdmin;+@BeforeAllstatic void configureRestAssured() {RestAssuredJsonUtils.configureAwsContentTypes();}+ /**+ * GuardDuty's organization admin accounts are shared by every test in the JVM, and Macie+ * answers the same {@code /admin} route, so an admin left behind here makes+ * {@code MacieOrganizationIntegrationTest.sharedAdminRouteKeepsGuardDutyBehavior} see one+ * where it expects none. The flag keeps the teardown to the test that enabled it, so a+ * single-method run of this class still works.+ */+ @AfterEach+ void disableTheOrganizationAdminThisTestEnabled() {+ if (enabledOrganizationAdmin) {+ given().contentType("application/json")+ .header("Authorization", auth("444444444444"))+ .body("{\"adminAccountId\":\"444444444444\"}")+ .post("/admin/disable")+ .then().statusCode(200);+ enabledOrganizationAdmin = false;+ }+ }+@Testvoid createsUnassociatedMembersByDefault() {String detectorId = createDetector("111111111111");@@ -49,6 +71,7 @@ class GuardDutyMembersIntegrationTest {.body("{\"adminAccountId\":\"444444444444\"}").post("/admin/enable").then().statusCode(200);+ enabledOrganizationAdmin = true;String detectorId = createDetector("444444444444");