From b213cf580000e4cd0c368a6bcdc99aabcb09d9ba Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Mon, 25 Sep 2017 10:56:09 -0400 Subject: [PATCH] chore(halconfig): lint halconfig/settings.js --- halconfig/settings.js | 16 ++++++++-------- webpack.common.js | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/halconfig/settings.js b/halconfig/settings.js index fab0730b265..7bacedc7b9b 100644 --- a/halconfig/settings.js +++ b/halconfig/settings.js @@ -4,11 +4,11 @@ var feedbackUrl = ''; var gateHost = '{%gate.baseUrl%}'; var bakeryDetailUrl = (gateHost + '/bakery/logs/{{context.region}}/{{context.status.resourceId}}'); var authEndpoint = (gateHost + '/auth/user'); -var authEnabled = {%features.auth%}; -var chaosEnabled = {%features.chaos%}; -var fiatEnabled = {%features.fiat%}; -var jobsEnabled = {%features.jobs%}; -var pipelineTemplatesEnabled = {%features.pipelineTemplates%}; +var authEnabled = '{%features.auth%}' === 'true'; +var chaosEnabled = '{%features.chaos%}' === 'true'; +var fiatEnabled = '{%features.fiat%}' === 'true'; +var jobsEnabled = '{%features.jobs%}' === 'true'; +var pipelineTemplatesEnabled = '{%features.pipelineTemplates%}' === 'true'; var timezone = '{%timezone%}'; var version = '{%version%}'; var changelogGistId = '{%changelog.gist.id%}'; @@ -33,7 +33,7 @@ var kubernetes = { var appengine = { defaults: { account: '{%appengine.default.account%}', - editLoadBalancerStageEnabled: {%appengine.enabled%} + editLoadBalancerStageEnabled: '{%appengine.enabled%}' === 'true' } }; var openstack = { @@ -61,7 +61,7 @@ var dcos = { }; var entityTagsEnabled = false; var netflixMode = false; -var notifications = '{%notifications.enabled%}' === 'true' +var notificationsEnabled = '{%notifications.enabled%}' === 'true'; var slack = { enabled: '{%notifications.slack.enabled%}' === 'true', botName: '{%notifications.slack.botName%}' @@ -138,7 +138,7 @@ window.spinnakerSettings = { jobs: jobsEnabled, pipelineTemplates: pipelineTemplatesEnabled, pipelines: true, - notifications: notifications, + notifications: notificationsEnabled, fastProperty: true, vpcMigrator: true, clusterDiff: false, diff --git a/webpack.common.js b/webpack.common.js index f441c5e551d..bc56ed5d8a6 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -155,6 +155,7 @@ function configure(IS_TEST) { if (!IS_TEST) { config.entry = { settings: './settings.js', + halconfig: './halconfig/settings.js', app: './app/scripts/app.ts', vendor: [ 'jquery', 'angular', 'angular-ui-bootstrap', 'source-sans-pro',