fix(config): Make dryRun overrideable at resource level (#346)

- make global dryRun overrideable
spinnaker · Feb 19, 2020 · 3c116f1 · 3c116f1
1 parent 2a7bd7e
commit 3c116f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/config/SwabbieProperties.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/config/SwabbieProperties.kt
@@ -126,7 +126,7 @@ class Exclusion {
 class ResourceTypeConfiguration {
   var enabled: Boolean = false
   var enabledActions: List<Action> = mutableListOf(Action.MARK, Action.NOTIFY, Action.DELETE)
-  var dryRun: Boolean = true
+  var dryRun: Boolean = false
   var retention: Int = 14
   var exclusions: MutableSet<Exclusion> = mutableSetOf()
   lateinit var name: String

diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/WorkConfigurator.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/WorkConfigurator.kt
@@ -94,7 +94,7 @@ open class WorkConfigurator(
                 cloudProviderConfiguration.exclusions,
                 resourceTypeConfiguration.exclusions
               ),
-              dryRun = if (swabbieProperties.dryRun) true else resourceTypeConfiguration.dryRun,
+              dryRun = if (resourceTypeConfiguration.dryRun) true else swabbieProperties.dryRun,
               notificationConfiguration = resourceTypeConfiguration.notification,
               entityTaggingEnabled = resourceTypeConfiguration.entityTaggingEnabled,
               maxAge = resourceTypeConfiguration.maxAge,