feat(amazon/loadBalancers): Allow setting to disable manual oidc conf…

…ig (spinnaker#5683)
eromanova · Aug 29, 2018 · 51a70ae · 51a70ae
1 parent 1edd417
commit 51a70ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 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
@@ -713,10 +713,12 @@ const Action = (props: {
   if (props.action.type === 'authenticate-oidc') {
     const clientId = props.action.authenticateOidcConfig.clientId;
 
+    const disableManualOidcDialog = get(AWSProviderSettings, 'loadBalancers.disableManualOidcDialog', false);
     const showOidcConfigs =
-      props.oidcConfigs &&
-      props.oidcConfigs.length > 0 &&
-      (!clientId || props.oidcConfigs.find(c => c.clientId === clientId));
+      disableManualOidcDialog ||
+      (props.oidcConfigs &&
+        props.oidcConfigs.length > 0 &&
+        (!clientId || props.oidcConfigs.find(c => c.clientId === clientId)));
     return (
       <div className="horizontal middle" style={{ height: '30px' }}>
         <span style={{ whiteSpace: 'pre' }}>auth with {CustomLabels.get('OIDC client')} </span>

diff --git a/settings.js b/settings.js
@@ -55,6 +55,7 @@ window.spinnakerSettings = {
         // if true, VPC load balancers will be created as internal load balancers if the selected subnet has a purpose
         // tag that starts with "internal"
         inferInternalFlagFromSubnet: false,
+        disableManualOidcDialog: false,
       },
       useAmiBlockDeviceMappings: false,
     },