Merge pull request #4 from MridulS/ssl

explicit ssl config, and update configmap for boolean values
bitnik · Apr 14, 2021 · c5a0f72 · c5a0f72
2 parents 2fa9368 + 9f5bac3
commit c5a0f72
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/helm-chart/binder-launches/Chart.yaml b/helm-chart/binder-launches/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: binder-launches
-version: 0.1.1
+version: 0.1.2
 appVersion: "0.1.0"
 # kubeVersion: A SemVer range of compatible Kubernetes versions (optional)
 description: A Helm chart for Kubernetes

diff --git a/helm-chart/binder-launches/templates/configmap.yaml b/helm-chart/binder-launches/templates/configmap.yaml
@@ -4,18 +4,17 @@ metadata:
   name: {{ .Release.Name }}-configmap
 data:
   # `|-` is for declaring a multi-line string
+  # To check boolean values explicity, we use
+  # (kindIs "invalid") to check if the value is nil.
   config.js: |-
     const config = {
     {{- if .Values.baseUrl }}
     baseUrl: {{ .Values.baseUrl | quote }},
     {{- end }}
-    {{- if .Values.port }}
-    port: {{ .Values.port }},
-    {{- end }}
-    {{- if .Values.debug }}
+    {{- if not (kindIs "invalid" .Values.debug) }}
     debug: {{ .Values.debug }},
     {{- end }}
-    {{- if .Values.db.ssl }}
+    {{- if not (kindIs "invalid" .Values.db.ssl) }}
     dbSSL: {{ .Values.db.ssl }},
     {{- end }}
     //db: "postgres://{{ template "binder-launches.dbURL" . }}"

diff --git a/server/server.js b/server/server.js
@@ -40,19 +40,31 @@ const app = express();
 app.use(expressLogger);
 const port = config.port;
 
-const sequelize = new Sequelize(config.db,
-    {
-        // https://sequelize.org/master/class/lib/sequelize.js~Sequelize.html
-        dialect: 'postgres',
-        protocol: 'postgres',
-        dialectOptions: {
-            ssl: {
-                require: config.dbSSL,
-                rejectUnauthorized: false
-            }
-        },
-        logging: config.debug
-    });
+let sequelize;
+if (config.dbSSL){
+    sequelize = new Sequelize(config.db,
+        {
+            // https://sequelize.org/master/class/lib/sequelize.js~Sequelize.html
+            dialect: 'postgres',
+            protocol: 'postgres',
+            dialectOptions: {
+                ssl: {
+                    require: true,
+                    rejectUnauthorized: false
+                }
+            },
+            logging: config.debug
+        });
+} else {
+    sequelize = new Sequelize(config.db,
+        {
+            // https://sequelize.org/master/class/lib/sequelize.js~Sequelize.html
+            dialect: 'postgres',
+            protocol: 'postgres',
+            logging: config.debug
+        });
+}
+
 
 // init Launch model
 const Launch = _Launch(sequelize, DataTypes);