fix(core): Ensure resource is removed from db when deleted (#302)

- updated to ensure the deleted resource is removed from the db
spinnaker · Nov 14, 2019 · a3d22fd · a3d22fd
1 parent e816874
commit a3d22fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/AbstractResourceTypeHandler.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/AbstractResourceTypeHandler.kt
@@ -500,10 +500,14 @@ abstract class AbstractResourceTypeHandler<T : Resource>(
     val maxItemsToProcess = min(confirmedResourcesToDelete.size, workConfiguration.getMaxItemsProcessedPerCycle(dynamicConfigService))
     confirmedResourcesToDelete.subList(0, maxItemsToProcess).let {
       partitionList(it, workConfiguration).forEach { partition ->
-        if (!partition.isEmpty()) {
+        if (partition.isNotEmpty()) {
           try {
             deleteResources(partition, workConfiguration)
-            partition.forEach { it -> applicationEventPublisher.publishEvent(DeleteResourceEvent(it, workConfiguration)) }
+            partition.forEach { markedResource ->
+              applicationEventPublisher.publishEvent(DeleteResourceEvent(markedResource, workConfiguration))
+              resourceRepository.remove(markedResource)
+            }
+
             candidateCounter.addAndGet(partition.size)
           } catch (e: Exception) {
             log.error("Failed to delete $it. Configuration: {}", workConfiguration.toLog(), e)