luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #7127 from hashicorp/bugfix/ui-correct-env-switch 

ui: Change environment switch statement to correct env vars
This commit is contained in:
John Cowen 2020-01-24 16:59:25 +00:00 committed by GitHub
parent cdacfcaa6d 950745dfbe
commit ef0840997d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-v2/config/environment.js
View File

@ -97,7 +97,7 @@ module.exports = function(environment) {
autoboot: false,
}),
});
// passthrough
break;
case environment === 'staging':
ENV = Object.assign({}, ENV, {
'@hashicorp/ember-cli-api-double': {
@ -105,14 +105,16 @@ module.exports = function(environment) {
endpoints: ['/node_modules/@hashicorp/consul-api-double/v1'],
},
});
// passthrough
break;
case environment === 'production':
ENV = Object.assign({}, ENV, {
CONSUL_ACLS_ENABLED: '{{.ACLsEnabled}}',
CONSUL_NSPACES_ENABLED:
'{{ if .NamespacesEnabled }}{{.NamespacesEnabled}}{{ else }}false{{ end }}',
});
// passthrough
break;
}
switch (true) {
case isDevLike:
ENV = Object.assign({}, ENV, {
CONSUL_NSPACES_ENABLED: true,