fix(notifications): fix editing notifications in halyard (spinnaker#1413

) Broken in spinnaker#1374 Closes spinnaker/spinnaker#4834
atlassian-forks · Sep 19, 2019 · 160c64d · 160c64d
1 parent 7ccf726
commit 160c64d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Notification.java b/...config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Notification.java
@@ -52,6 +52,10 @@ public enum NotificationType {
       this.name = name;
     }
 
+    public String getName() {
+      return name;
+    }
+
     @Override
     public String toString() {
       return name;

diff --git a/...onfig/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Notifications.java b/...onfig/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Notifications.java
@@ -18,11 +18,16 @@
 
 package com.netflix.spinnaker.halyard.config.model.v1.node;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.netflix.spinnaker.halyard.config.model.v1.node.Notification.NotificationType;
 import com.netflix.spinnaker.halyard.config.model.v1.notifications.GithubStatusNotification;
 import com.netflix.spinnaker.halyard.config.model.v1.notifications.SlackNotification;
 import com.netflix.spinnaker.halyard.config.model.v1.notifications.TwilioNotification;
+import java.util.Optional;
+import java.util.stream.Stream;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -46,8 +51,18 @@ public boolean isEnabled() {
   }
 
   public static Class<? extends Notification> translateNotificationType(String notificationName) {
-    Class<? extends Notification> n;
-    switch (Notification.NotificationType.valueOf(notificationName)) {
+
+    Optional<NotificationType> notificationType =
+        Stream.of(NotificationType.values())
+            .filter(type -> type.getName().equals(notificationName))
+            .findAny();
+
+    checkArgument(
+        notificationType.isPresent(),
+        "No notification type with name %s handled by halyard",
+        notificationName);
+
+    switch (notificationType.get()) {
       case SLACK:
         return SlackNotification.class;
       case TWILIO: