Interim fix accepting self-signed tls certs in postgres

Fortify-Labs · Feb 12, 2021 · 50bfcd4 · 50bfcd4
1 parent 9025e41
commit 50bfcd4
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -71,8 +71,9 @@ jobs:
       - run: mkdir -p ~/.kube/ && touch ~/.kube/config && echo ${{ secrets.KUBECONFIG }} | base64 --decode > ~/.kube/config
       - run: touch .env && echo ${{ secrets.K8S_DOTENV }} | base64 --decode > .env
       - run: npm ci
-      - run: npm run record
-      - run: npm run build
+      # - run: npm run record
+      # - run: npm run build
+      - run: npm run synth
       - run: kubectl apply -f dist/fortify.k8s.yaml
       - uses: sarisia/actions-status-discord@v1
         if: always()

diff --git a/devops/kubernetes/src/cluster.ts b/devops/kubernetes/src/cluster.ts
@@ -22,7 +22,6 @@ import {
 	KafkaTopic,
 	KafkaTopicProps,
 } from "../imports/kafka.strimzi.io";
-import { Postgres } from "../imports/kubedb.com";
 import { RedisFailover } from "../imports/databases.spotahome.com";
 import { Elasticsearch } from "../imports/elasticsearch.k8s.elastic.co";
 import { Kibana } from "../imports/kibana.k8s.elastic.co";

diff --git a/services/17kmmrbot/package-lock.json b/services/17kmmrbot/package-lock.json
diff --git a/services/17kmmrbot/package.json b/services/17kmmrbot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "17kmmrbot",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Fortify twitch bot",
   "private": "true",
   "engines": {

diff --git a/services/backend/package-lock.json b/services/backend/package-lock.json
diff --git a/services/backend/package.json b/services/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "private": true,
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/services/fsm/package-lock.json b/services/fsm/package-lock.json
diff --git a/services/fsm/package.json b/services/fsm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fsm",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Finite State Machine",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/historization/package-lock.json b/services/historization/package-lock.json
diff --git a/services/historization/package.json b/services/historization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "historization",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "A historization service responsible for persisting info",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/jobs/package-lock.json b/services/jobs/package-lock.json
diff --git a/services/jobs/package.json b/services/jobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jobs",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Job scripts and one off scripts",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/shared/package-lock.json b/services/shared/package-lock.json
diff --git a/services/shared/package.json b/services/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shared",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "Shared library for fortify micro services",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/services/shared/src/connectors/postgres.ts b/services/shared/src/connectors/postgres.ts
@@ -16,7 +16,6 @@ const {
 	POSTGRES_PORT,
 	POSTGRES_DATABASE,
 	POSTGRES_SSL = "false",
-	// NODE_ENV,
 	DB_LOG,
 } = process.env;
 
@@ -71,7 +70,6 @@ export class PostgresConnector implements HealthCheckable, Connector {
 
 		const connection = createConnection({
 			type: "postgres",
-			ssl: POSTGRES_SSL === "true",
 			host: POSTGRES_HOST,
 			port: parseInt(POSTGRES_PORT ?? "5432"),
 			username: POSTGRES_USER,
@@ -83,6 +81,12 @@ export class PostgresConnector implements HealthCheckable, Connector {
 			// synchronize: NODE_ENV === "development",
 			synchronize: false,
 			logging: DB_LOG === "true",
+			ssl:
+				POSTGRES_SSL === "true"
+					? {
+							rejectUnauthorized: false,
+					  }
+					: undefined,
 			poolErrorHandler: (e) => {
 				this.logger.error("Postgres pool connection error occurred", {
 					e,