Light, fluffy, and always free - The AWS Local Emulator alternative
chore(cloudformation): remove the unused hasPendingRollbackCleanup hook (#4515)
stodan123941dd031a
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceDispatcher.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceDispatcher.javaindex dd13f7ca77..5b61938b9c 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceDispatcher.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceDispatcher.java@@ -218,13 +218,6 @@ public class CfnResourceDispatcher {.orElse(null);}- /** Whether an opted-in provisioner still tracks cleanup owed by an UPDATE_FAILED resource. */- public boolean hasPendingRollbackCleanup(StackResource resource) {- return registry.forType(resource.getResourceType())- .map(owner -> owner.hasPendingRollbackCleanup(resource))- .orElse(false);- }-/** Only an opted-in provisioner may keep a failed update attempt in place of the previous resource. */public boolean retainsFailedUpdateState(StackResource resource) {return registry.forType(resource.getResourceType())diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.javaindex df98a319ea..72676ca1ff 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java@@ -51,15 +51,6 @@ public interface CfnResourceProvisioner {return rollbackUpdate(resource);}- /**- * Whether a failed update still tracks cleanup that this provisioner's ownership-aware delete- * owes. The engine no longer consults it: {@code DeleteStack} deletes every- * {@code UPDATE_FAILED} resource that has a physical id.- */- default boolean hasPendingRollbackCleanup(StackResource resource) {- return false;- }-/*** True when this provisioner keeps the failed update attempt's own identity and tracking for* its {@code rollbackUpdate}, so the engine must not restore the previous resource over it.diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisioner.javaindex 63941ae4b6..cf95088b8f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisioner.java@@ -187,12 +187,6 @@ public class LogsLogStreamCfnProvisioner implements CfnResourceProvisioner {return true;}- @Override- public boolean hasPendingRollbackCleanup(StackResource resource) {- return "true".equals(resource.getAttributes().get(CfnRollback.ROLLBACK_OWNED_ATTR))- || resource.getAttributes().containsKey(CLEANUP_ATTR);- }-@Overridepublic boolean hasReplacementUpdate(StackResource resource) {return resource.getAttributes().containsKey(CLEANUP_ATTR);diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisioner.javaindex 64d1cf26b2..eb38052e1f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisioner.java@@ -340,16 +340,6 @@ public class LogsMetricFilterCfnProvisioner implements CfnResourceProvisioner {&& (!snapshot.path("replacement").asBoolean() || ownership(priorState(snapshot)) == Ownership.UNOWNED);}- @Override- public boolean hasPendingRollbackCleanup(StackResource resource) {- return resource.getAttributes().containsKey(SNAPSHOT)- || resource.getAttributes().containsKey(STATE_ATTR)- || resource.getAttributes().containsKey(UNCERTAIN_ATTR)- || resource.getAttributes().containsKey(GROUP_ATTR)- || resource.getAttributes().containsKey(NAME_MODE_ATTR)- || "true".equals(resource.getAttributes().get(CfnRollback.ROLLBACK_OWNED_ATTR));- }-@Overridepublic boolean retainsFailedUpdateState(StackResource resource) {return resource.getAttributes().containsKey(SNAPSHOT);diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisionerTest.javaindex 8602973f7d..89af9035e6 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsLogStreamCfnProvisionerTest.java@@ -165,7 +165,6 @@ class LogsLogStreamCfnProvisionerTest {assertEquals("events", resource.getPhysicalId());verify(logs).deleteLogStream("new-group", "events", REGION);verify(logs, never()).deleteLogStream("old-group", "events", REGION);- assertTrue(provisioner.hasPendingRollbackCleanup(resource));clearInvocations(logs);provisioner.delete(resource, REGION);verify(logs).deleteLogStream("old-group", "events", REGION);@@ -223,7 +222,6 @@ class LogsLogStreamCfnProvisionerTest {provisioner.delete(resource, REGION);verify(logs, never()).deleteLogStream(anyString(), anyString(), anyString());- assertFalse(provisioner.hasPendingRollbackCleanup(resource));}@Test@@ -337,7 +335,6 @@ class LogsLogStreamCfnProvisionerTest {assertThrows(AwsException.class, () -> provisioner.rollbackUpdate(resource));assertEquals("events", resource.getPhysicalId());- assertTrue(provisioner.hasPendingRollbackCleanup(resource));doNothing().when(logs).deleteLogStream("new-group", "events", REGION);clearInvocations(logs);@@ -361,9 +358,7 @@ class LogsLogStreamCfnProvisionerTest {assertTrue(provisioner.completeUpdate(resource).complete());provisioner.clearUpdate(resource);- assertTrue(provisioner.hasPendingRollbackCleanup(resource));provisioner.delete(resource, REGION);- assertFalse(provisioner.hasPendingRollbackCleanup(resource));verify(logs).deleteLogStream("new-group", "events", REGION);verify(logs).deleteLogStream("old-group", "events", REGION);}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.javaindex cc3cc0d2d4..61507f2e49 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java@@ -957,7 +957,6 @@ class LogsMetricFilterCfnProvisionerTest {service.deleteMetricFilter(GROUP, "errors", REGION);create(props().put("FilterPattern", "UNRELATED"));JsonNode otherOwner = MAPPER.valueToTree(filter(GROUP, "errors"));- assertTrue(provisioner.hasPendingRollbackCleanup(resource), "untracked identity must reach safe cleanup inspection");assertThrows(IllegalStateException.class, () -> provisioner.delete(resource, REGION));assertEquals("UNKNOWN", mutationState(resource, false).path("ownership").asText());assertEquals(otherOwner, MAPPER.valueToTree(filter(GROUP, "errors")));