fix(quietperiods): case insensitive trigger type compare (#379)

* fix(quietperiods): case insensitive trigger type compare * chore(imports): clean up
spinnaker · Oct 26, 2018 · f38642e · f38642e
1 parent 8467913
commit f38642e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...ggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/QuietPeriodIndicator.java b/...ggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/QuietPeriodIndicator.java
@@ -23,9 +23,6 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
@@ -88,8 +85,17 @@ public boolean inQuietPeriod(long now) {
     return result;
   }
 
+  private boolean shouldSuppressType(String triggerType) {
+    for (String trigger: suppressedTriggerTypes) {
+      if (trigger.equalsIgnoreCase(triggerType)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public boolean inQuietPeriod(long now, String triggerType) {
-    return inQuietPeriod(now) && suppressedTriggerTypes.contains(triggerType);
+    return inQuietPeriod(now) && shouldSuppressType(triggerType);
   }
 
   private long parseIso(String iso) {

diff --git a/...c/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/QuietPeriodIndicatorSpec.groovy b/...c/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/QuietPeriodIndicatorSpec.groovy
@@ -86,4 +86,15 @@ class QuietPeriodIndicatorSpec extends Specification {
     !quietPeriodIndicator.inQuietPeriod(parseIso(inRangeDate), "notInTheList")
     quietPeriodIndicator.inQuietPeriod(parseIso(inRangeDate), "inTheList")
   }
+
+  def "trigger type list is case insensitive"() {
+    given:
+    ArrayList<String> triggerTypes = new ArrayList<>();
+    triggerTypes.add("inTheList")
+    QuietPeriodIndicatorConfigurationProperties config = new QuietPeriodIndicatorConfigurationProperties(true, goodStartDate, goodEndDate, triggerTypes);
+    QuietPeriodIndicator quietPeriodIndicator = new QuietPeriodIndicator(registry, config)
+
+    expect:
+    quietPeriodIndicator.inQuietPeriod(parseIso(inRangeDate), "inthelist")
+  }
 }