From c96b31e5626c583597526f66049b569ac32dc2d8 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Mon, 18 May 2020 20:22:37 +0100 Subject: [PATCH] ui: Ensure value is always passed to CONSUL_SSO_ENABLED (#7913) ACLsEnabled is always set to either true or false. .SSOEnabled is only set if you are running enterprise (the same as .NamespacesEnabled). Therefore .SSOEnabled and .NamespacesEnabled require conditionals to check their existence. In order to avoid future confusion we moved all go-template variables to use the conditional form, and added a comment to that effect. Tests have been added to reflect this, but they only test that the template outputs what we expect, true e2e testing here would be advantageous. --- ui-v2/config/environment.js | 6 ++++-- ui-v2/node-tests/config/environment.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui-v2/config/environment.js b/ui-v2/config/environment.js index f74e2bdfd9..1ee3c85f42 100644 --- a/ui-v2/config/environment.js +++ b/ui-v2/config/environment.js @@ -127,9 +127,11 @@ module.exports = function(environment, $ = process.env) { }); break; case environment === 'production': + // Make sure all templated variables check for existence first + // before outputting them, this means they all should be conditionals ENV = Object.assign({}, ENV, { - CONSUL_ACLS_ENABLED: '{{.ACLsEnabled}}', - CONSUL_SSO_ENABLED: '{{.SSOEnabled}}', + CONSUL_ACLS_ENABLED: '{{ if .ACLsEnabled }}{{.ACLsEnabled}}{{ else }}false{{ end }}', + CONSUL_SSO_ENABLED: '{{ if .SSOEnabled }}{{.SSOEnabled}}{{ else }}false{{ end }}', CONSUL_NSPACES_ENABLED: '{{ if .NamespacesEnabled }}{{.NamespacesEnabled}}{{ else }}false{{ end }}', }); diff --git a/ui-v2/node-tests/config/environment.js b/ui-v2/node-tests/config/environment.js index 8caac5262a..252e7846c9 100644 --- a/ui-v2/node-tests/config/environment.js +++ b/ui-v2/node-tests/config/environment.js @@ -9,8 +9,8 @@ test( { environment: 'production', CONSUL_BINARY_TYPE: 'oss', - CONSUL_ACLS_ENABLED: '{{.ACLsEnabled}}', - CONSUL_SSO_ENABLED: '{{.SSOEnabled}}', + CONSUL_ACLS_ENABLED: '{{ if .ACLsEnabled }}{{.ACLsEnabled}}{{ else }}false{{ end }}', + CONSUL_SSO_ENABLED: '{{ if .SSOEnabled }}{{.SSOEnabled}}{{ else }}false{{ end }}', CONSUL_NSPACES_ENABLED: '{{ if .NamespacesEnabled }}{{.NamespacesEnabled}}{{ else }}false{{ end }}', }, {