Feature/convict with config volume

.bundlewatch.config.js

@@ -14,11 +14,7 @@ module.exports = {
       "maxSize": "180 kB",
     },
     {
-      "path": "client-participation/dist/cached/*/js/polis.js",
-      "maxSize": "150 kB",
-    },
-    {
-      "path": "client-participation/dist/cached/*/js/vis_bundle.js",
+      "path": "client-participation/dist/*.js",
       "maxSize": "200 kB",
     },
   ]

.github/workflows/bundlewatch.yml

@@ -1,6 +1,7 @@
 name: "Bundlewatch Github Action"
 
 on:
+  workflow_dispatch:
   push:
     # Required so that baseline for comparison is pushed to bundlewatch service.
     branches: ["dev"]
@@ -53,10 +54,15 @@ jobs:
       working-directory: client-participation
       run: |
         npm install
-        cp polis.config.template.js polis.config.js
-        npm run deploy:prod
-        # So directory stays consistent between builds for comparison.
-        mv dist/cached/* dist/cached/xxxxxxxxx
+        npm run build:webpack
+
+    # - name: "Install & Build: client-participation"
+    #   working-directory: client-participation
+    #   run: |
+    #     npm install
+    #     npm run deploy:prod
+    #     # So directory stays consistent between builds for comparison.
+    #     mv dist/cached/* dist/cached/xxxxxxxxx
 
     - name: Install Bundlewatch
       run: npm install -g [email protected]

.github/workflows/cypress-tests.yml

@@ -2,6 +2,7 @@
 name: E2E Tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - dev

.github/workflows/depcheck.yml

@@ -1,5 +1,6 @@
 name: DepCheck
 on:
+  workflow_dispatch:
   pull_request:
     types: ["opened", "reopened", "synchronize"]
     paths:

.github/workflows/deploy-preprod.yml

@@ -1,4 +1,5 @@
 on:
+  workflow_dispatch:
   push:
     branches:
       - dev

.github/workflows/lint.yml

@@ -1,6 +1,7 @@
 name: Lint
 
 on:
+  workflow_dispatch:
   pull_request:
     types: ["opened", "reopened", "synchronize"]
 

.github/workflows/release-docker-images.yml

@@ -2,6 +2,7 @@
 name: Docker image builds
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

.github/workflows/test-clojure.yml

@@ -1,6 +1,7 @@
 name: Test Math
 
 on:
+  workflow_dispatch:
   push:
     branches: ["dev", "504-clj-tests"]
     # Note: Only configured for client-admin right now.

client-admin/Dockerfile

@@ -8,8 +8,9 @@ RUN apk add git --no-cache
 COPY package*.json ./
 RUN npm install
 
-COPY polis.config.template.js polis.config.js
-# If polis.config.js exists on host, will override template here.
+COPY --from=polis_config /config/config.js /app/config/
+COPY --from=polis_config /config/*.yaml /app/config/
+
 COPY . .
 
 ARG GIT_HASH

client-admin/dev-server.js

@@ -11,7 +11,8 @@ var request = require("request");
 var app = express();
 var compiler = webpack(config);
 
-var polisConfig = require("./polis.config");
+let POLIS_ROOT = process.env.POLIS_ROOT
+var config = require(POLIS_ROOT + 'config/config.js');
 
 app.use(
   require("webpack-dev-middleware")(compiler, {
@@ -20,7 +21,7 @@ app.use(
   })
 );
 
-const serviceUrl = polisConfig.SERVICE_URL ? polisConfig.SERVICE_URL : "https://pol.is";
+const serviceUrl = config.get('service_url') ? config.get('service_url') : "https://pol.is";
 console.log("SERVICE_URL:", serviceUrl);
 
 function proxy(req, res) {
@@ -58,10 +59,10 @@ app.get(/^\/embed\/?$/, function (req, res) {
 app.get("*", function (req, res) {
   var html = fs.readFileSync(path.join(__dirname, "index.html"), { encoding: "utf8" });
 
-  html = html.replace("<%= fbAppId %>", polisConfig.FB_APP_ID);
-  html = html.replace("<%= useIntercom %>", !isTrue(polisConfig.DISABLE_INTERCOM));
-  html = html.replace("<%= usePlans %>", !isTrue(polisConfig.DISABLE_PLANS));
-  var domainWhitelist = '["' + polisConfig.domainWhitelist.join('","') + '"]';
+  html = html.replace("<%= fbAppId %>", config.get('fb_app_id'));
+  html = html.replace("<%= useIntercom %>", !isTrue(config.get('disable_intercom')));
+  html = html.replace("<%= usePlans %>", !isTrue(config.get('disable_plans')));
+  var domainWhitelist = '["' + config.get('domainWhitelist').join('","') + '"]';
   html = html.replace("<%= domainWhitelist %>", domainWhitelist);
 
   res.set({

client-admin/gulpfile.js

@@ -13,9 +13,10 @@ var rimraf = require("rimraf");
 var runSequence = require("run-sequence");
 var scp = require("gulp-scp2");
 
-var polisConfig = require("./polis.config");
+let POLIS_ROOT = process.env.POLIS_ROOT
+var config = require(POLIS_ROOT + 'config/config.js');
 
-console.log("Uploader: " + polisConfig.UPLOADER);
+console.log("Uploader: " + config.get('uploader'));
 
 const staticFilesPrefix = "cached";
 const baseDistRoot = "dist";
@@ -78,11 +79,11 @@ gulp.task("index", [], function () {
   );
   html = html.replace("NULL_VERSION", versionString);
 
-  html = html.replace("<%= fbAppId %>", polisConfig.FB_APP_ID);
-  html = html.replace("<%= useIntercom %>", !isTrue(polisConfig.DISABLE_INTERCOM));
-  html = html.replace("<%= usePlans %>", !isTrue(polisConfig.DISABLE_PLANS));
+  html = html.replace("<%= fbAppId %>", config.get('fb_app_id'));
+  html = html.replace("<%= useIntercom %>", !isTrue(config.get('disable_intercom')));
+  html = html.replace("<%= usePlans %>", !isTrue(config.get('disable_plans')));
 
-  var domainWhitelist = '["' + polisConfig.domainWhitelist.join('","') + '"]';
+  var domainWhitelist = '["' + config.get('domainWhitelist').join('","') + '"]';
   html = html.replace("<%= domainWhitelist %>", domainWhitelist);
 
   // index goes to the root of the dist folder.
@@ -129,8 +130,8 @@ gulp.task("404", [], function () {
 gulp.task("preprodConfig", function () {
   preprodMode = true;
   minified = true;
-  scpSubdir = polisConfig.SCP_SUBDIR_PREPROD;
-  s3Subdir = polisConfig.S3_BUCKET_PREPROD;
+  scpSubdir = config.get('scp_subdir_preprod');
+  s3Subdir = config.get('s3_bucket_preprod');
 });
 
 gulp.task("unminifiedConfig", function () {
@@ -140,8 +141,8 @@ gulp.task("unminifiedConfig", function () {
 gulp.task("prodConfig", function () {
   prodMode = true;
   minified = true;
-  scpSubdir = polisConfig.SCP_SUBDIR_PROD;
-  s3Subdir = polisConfig.S3_BUCKET_PROD;
+  scpSubdir = config.get('scp_subdir_prod');
+  s3Subdir = config.get('s3_bucket_prod');
 });
 
 gulp.task("configureForProduction", function (callback) {
@@ -220,12 +221,12 @@ gulp.task("dist", ["configureForProduction"], function (callback) {
 
 gulp.task("deploy_TO_PRODUCTION", ["prodConfig", "dist"], function () {
   var uploader;
-  if ("s3" === polisConfig.UPLOADER) {
+  if ("s3" === config.get('uploader')) {
     uploader = s3uploader({
       bucket: s3Subdir,
     });
   }
-  if ("scp" === polisConfig.UPLOADER) {
+  if ("scp" === config.get('uploader')) {
     uploader = scpUploader({
       // subdir: "cached",
       watch: function (client) {
@@ -235,7 +236,7 @@ gulp.task("deploy_TO_PRODUCTION", ["prodConfig", "dist"], function () {
       },
     });
   }
-  if ('local' === polisConfig.UPLOADER) {
+  if ('local' === config.get('uploader')) {
     uploader = localUploader
     uploader.needsHeadersJson = true
   }
@@ -244,12 +245,12 @@ gulp.task("deploy_TO_PRODUCTION", ["prodConfig", "dist"], function () {
 
 function doUpload() {
   var uploader;
-  if ("s3" === polisConfig.UPLOADER) {
+  if ("s3" === config.get('uploader')) {
     uploader = s3uploader({
       bucket: s3Subdir,
     });
   }
-  if ("scp" === polisConfig.UPLOADER) {
+  if ("scp" === config.get('uploader')) {
     uploader = scpUploader({
       // subdir: "cached",
       watch: function (client) {
@@ -259,7 +260,7 @@ function doUpload() {
       },
     });
   }
-  if ('local' === polisConfig.UPLOADER) {
+  if ('local' === config.get('uploader')) {
     uploader = localUploader
     uploader.needsHeadersJson = true
   }
@@ -272,19 +273,19 @@ gulp.task("deployPreprodUnminified", ["preprodConfig", "unminifiedConfig", "dist
 
 gulp.task("fontsPreprod", ["preprodConfig"], function () {
   return deployFonts({
-    bucket: polisConfig.S3_BUCKET_PREPROD,
+    bucket: config.get('s3_bucket_preprod'),
   });
 });
 
 gulp.task("fontsProd", ["prodConfig"], function () {
   return deployFonts({
-    bucket: polisConfig.S3_BUCKET_PROD,
+    bucket: config.get('s3_bucket_prod'),
   });
 });
 
 function localUploader(params) {
   params.subdir = params.subdir || ''
-  return gulp.dest(path.join(polisConfig.LOCAL_OUTPUT_PATH, params.subdir))
+  return gulp.dest(path.join(config.get('local_output_path'), params.subdir))
 }
 
 function s3uploader(params) {

client-admin/package.json

@@ -9,7 +9,8 @@
     "build:webpack_unminified": "npm run clean && NODE_ENV=development webpack --config webpack.config.unminified.js",
     "build": "npm run build:webpack",
     "build-debug": "npm run build:webpack_unminified",
-    "deploy:prod": "node gulpfile.js deploy_TO_PRODUCTION",
+    "convict": "6.0.0",
+    "deploy:prod": "POLIS_ROOT=/app/ node gulpfile.js deploy_TO_PRODUCTION",
     "deploy:preprod": "node gulpfile.js deployPreprod",
     "start": "./x",
     "lint": "eslint src",
@@ -58,8 +59,10 @@
   },
   "dependencies": {
     "boolean": "^3.0.2",
+    "convict": "6.0.0",
     "d3-scale": "^3.2.3",
     "jquery": "^2.1.4",
+    "js-yaml": "3.14.0",
     "lodash": "^4.17.21",
     "prop-types": "^15.7.2",
     "react": "^16.14.0",