Merge pull request #105 from jeyrschabu/fixeclude

jeyrschabu · web-flow · commit c91be9520dda · 2018-09-07T20:07:24.000-07:00
fix(handler): Fixing bug on excluding a candidate
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
@@ -323,7 +323,7 @@ abstract class AbstractResourceTypeHandler<T : Resource>(
           var shouldSkip = false
           val candidate = candidates.find { it.resourceId == r.resourceId }
           if ((candidate == null || candidate.getViolations().isEmpty()) ||
-            shouldExcludeResource(candidates.first(), workConfiguration, optedOutResourceStates, Action.DELETE)) {
+            shouldExcludeResource(candidate, workConfiguration, optedOutResourceStates, Action.DELETE)) {
             shouldSkip = true
             ensureResourceUnmarked(r, workConfiguration)
           }

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ abstract class AbstractResourceTypeHandler<T : Resource>(`
`323`	`323`	`var shouldSkip = false`
`324`	`324`	`val candidate = candidates.find { it.resourceId == r.resourceId }`
`325`	`325`	`if ((candidate == null \|\| candidate.getViolations().isEmpty()) \|\|`
`326`		`- shouldExcludeResource(candidates.first(), workConfiguration, optedOutResourceStates, Action.DELETE)) {`
	`326`	`+ shouldExcludeResource(candidate, workConfiguration, optedOutResourceStates, Action.DELETE)) {`
`327`	`327`	`shouldSkip = true`
`328`	`328`	`ensureResourceUnmarked(r, workConfiguration)`
`329`	`329`	`}`