fix(aws/loadBalancers): Add validator for multiple listeners on same …

…port (#8127)
spinnaker · Apr 3, 2020 · 17dcc95 · 17dcc95
1 parent 8dd9fd6
commit 17dcc95
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/application/ALBListeners.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/application/ALBListeners.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { $q } from 'ngimport';
 import { SortableContainer, SortableElement, SortableHandle, arrayMove, SortEnd } from 'react-sortable-hoc';
-import { difference, flatten, get, some, uniq } from 'lodash';
+import { difference, flatten, get, some, uniq, uniqBy } from 'lodash';
 import { FormikErrors, FormikProps } from 'formik';
 
 import {
@@ -115,6 +115,11 @@ export class ALBListeners extends React.Component<IALBListenersProps, IALBListen
       errors.listeners = `Target groups ${unusedTargetGroupNames.join(', ')} are unused.`;
     }
 
+    const { listeners } = values;
+    if (uniqBy(listeners, 'port').length < listeners.length) {
+      errors.listenerPorts = 'Multiple listeners cannot use the same port.';
+    }
+
     const missingRuleFields = values.listeners.find(l => {
       const defaultActionsHaveMissingTarget = !!l.defaultActions.find(
         da =>
@@ -578,6 +583,11 @@ export class ALBListeners extends React.Component<IALBListenersProps, IALBListen
                 </div>
               </div>
             ))}
+            {errors.listenerPorts && (
+              <div className="wizard-pod-row-errors">
+                <ValidationMessage type="error" message={errors.listenerPorts} />
+              </div>
+            )}
             {errors.listeners && (
               <div className="wizard-pod-row-errors">
                 <ValidationMessage type="error" message={errors.listeners} />

diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/network/NLBListeners.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/network/NLBListeners.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { difference, flatten, uniq } from 'lodash';
+import { difference, flatten, uniq, uniqBy } from 'lodash';
 
 import { ValidationMessage, IWizardPageComponent } from '@spinnaker/core';
 
@@ -34,6 +34,11 @@ export class NLBListeners extends React.Component<INLBListenersProps>
       errors.listeners = `Target groups ${unusedTargetGroupNames.join(', ')} are unused.`;
     }
 
+    const { listeners } = values;
+    if (uniqBy(listeners, 'port').length < listeners.length) {
+      errors.listenerPorts = 'Multiple listeners cannot use the same port.';
+    }
+
     return errors;
   }
 
@@ -170,6 +175,11 @@ export class NLBListeners extends React.Component<INLBListenersProps>
                 </div>
               </div>
             ))}
+            {errors.listenerPorts && (
+              <div className="wizard-pod-row-errors">
+                <ValidationMessage type="error" message={errors.listenerPorts} />
+              </div>
+            )}
             {errors.listeners && (
               <div className="wizard-pod-row-errors">
                 <ValidationMessage type="error" message={errors.listeners} />