Merge pull request #7 from JordanPawlett/enforce-database-per-service…

…-architecture Enforce database per service architecture
heynatefox · Jun 13, 2020 · eed4926 · eed4926
2 parents 60460a2 + 25e1656
commit eed4926
Show file tree

Hide file tree

Showing 35 changed files with 281 additions and 37 deletions.
diff --git a/config/base-config.yaml b/config/base-config.yaml
@@ -5,6 +5,5 @@ metadata:
 data:
   NODE_ENV: development
   TRANSPORTER_URI: nats://nats-client.default.svc.cluster.local:4222
-  MONGO_URI: mongodb://mongo-mongodb.default.svc.cluster.local:27017
   REDIS_HOST: redis-master.default.svc.cluster.local
   REDIS_PORT: "6379"
diff --git a/services/admin-gateway-service/dev.Dockerfile b/services/admin-gateway-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/admin-gateway-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/admin-gateway-service/k8s-pod.yaml b/services/admin-gateway-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

diff --git a/services/admin-gateway-service/src/index.ts b/services/admin-gateway-service/src/index.ts
@@ -29,8 +29,8 @@ const broker = new ServiceBroker({
   metrics: false,
   cacher: {
     type: 'Redis',
-    prefix: 'ADMIN-MOL',
     options: {
+      prefix: 'ADMIN-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/cards-service/dev.Dockerfile b/services/cards-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/cards-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/cards-service/k8s-pod.yaml b/services/cards-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,4 +32,6 @@ spec:
           env:
             - name: PORT
               value: "80"
+            - name: MONGO_URI
+              value: mongodb://cards-mongo-mongodb.default.svc.cluster.local:27017
       restartPolicy: Always
diff --git a/services/cards-service/src/index.ts b/services/cards-service/src/index.ts
@@ -28,8 +28,8 @@ const broker = new ServiceBroker({
   metrics: false,
   cacher: {
     type: 'Redis',
-    prefix: 'CARDS-MOL',
     options: {
+      prefix: 'CARDS-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/clients-service/.dockerignore b/services/clients-service/.dockerignore
@@ -9,4 +9,5 @@ Dockerfile*
 docker-compose*
 .dockerignore
 .git
-.gitignore
+.gitignore
+src/clean-up.js
diff --git a/services/clients-service/.gitignore b/services/clients-service/.gitignore
@@ -2,4 +2,5 @@ package-lock.json
 build
 node_modules
 data
-/src/auth.json
+/src/auth.json
+src/clean-up.js
diff --git a/services/clients-service/dev.Dockerfile b/services/clients-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/clients-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/clients-service/k8s-pod.yaml b/services/clients-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,6 +32,8 @@ spec:
           env:
             - name: PORT
               value: "80"
+            - name: MONGO_URI
+              value: mongodb://clients-mongo-mongodb.default.svc.cluster.local:27017
             - name: JWT_SECRET
               valueFrom:
                 secretKeyRef:

diff --git a/services/clients-service/src/index.ts b/services/clients-service/src/index.ts
@@ -26,10 +26,10 @@ const broker = new ServiceBroker({
   logLevel: 'info',
   logFormatter: 'short',
   metrics: false,
-    cacher: {
+  cacher: {
     type: 'Redis',
-    prefix: 'CLIENTS-MOL',
     options: {
+      prefix: 'CLIENTS-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/decks-service/dev.Dockerfile b/services/decks-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/decks-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/decks-service/k8s-pod.yaml b/services/decks-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,4 +32,6 @@ spec:
           env:
             - name: PORT
               value: "80"
+            - name: MONGO_URI
+              value: mongodb://decks-mongo-mongodb.default.svc.cluster.local:27017
       restartPolicy: Always
diff --git a/services/decks-service/src/index.ts b/services/decks-service/src/index.ts
@@ -27,10 +27,10 @@ const broker = new ServiceBroker({
   logLevel: 'info',
   logFormatter: 'short',
   metrics: false,
-    cacher: {
+  cacher: {
     type: 'Redis',
-    prefix: 'DECKS-MOL',
     options: {
+      prefix: 'DECKS-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/games-service/k8s-pod.yaml b/services/games-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,4 +32,6 @@ spec:
           env:
             - name: PORT
               value: "80"
+            - name: MONGO_URI
+              value: mongodb://games-mongo-mongodb.default.svc.cluster.local:27017
       restartPolicy: Always
diff --git a/services/games-service/src/index.ts b/services/games-service/src/index.ts
@@ -29,8 +29,8 @@ const broker = new ServiceBroker({
   metrics: false,
   cacher: {
     type: 'Redis',
-    prefix: 'GAMES-MOL',
     options: {
+      prefix: 'GAMES-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/nginx/k8s-pod.yaml b/services/nginx/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

diff --git a/services/rooms-service/dev.Dockerfile b/services/rooms-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/rooms-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/rooms-service/k8s-pod.yaml b/services/rooms-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,4 +32,6 @@ spec:
           env:
             - name: PORT
               value: "80"
+            - name: MONGO_URI
+              value: mongodb://rooms-mongo-mongodb.default.svc.cluster.local:27017
       restartPolicy: Always
diff --git a/services/rooms-service/src/index.ts b/services/rooms-service/src/index.ts
@@ -27,10 +27,10 @@ const broker = new ServiceBroker({
   logLevel: 'info',
   logFormatter: 'short',
   metrics: false,
-    cacher: {
+  cacher: {
     type: 'Redis',
-    prefix: 'ROOMS-MOL',
     options: {
+      prefix: 'ROOMS-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/web-gateway-service/dev.Dockerfile b/services/web-gateway-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/web-gateway-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/web-gateway-service/k8s-pod.yaml b/services/web-gateway-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

diff --git a/services/web-gateway-service/src/index.ts b/services/web-gateway-service/src/index.ts
@@ -27,10 +27,10 @@ const broker = new ServiceBroker({
   logLevel: 'info',
   logFormatter: 'short',
   metrics: false,
-    cacher: {
+  cacher: {
     type: 'Redis',
-    prefix: 'WEB-G-MOL',
     options: {
+      prefix: 'WEB-G-MOL',
       redis: {
         host: process.env.REDIS_HOST,
         port: process.env.REDIS_PORT,

diff --git a/services/websocket-gateway-service/dev.Dockerfile b/services/websocket-gateway-service/dev.Dockerfile
@@ -3,4 +3,5 @@ WORKDIR /home/service/websocket-gateway-service
 COPY ./package.json ./
 RUN yarn
 COPY . .
+ENV NODE_ENV=development
 CMD yarn run dev
diff --git a/services/websocket-gateway-service/k8s-pod.yaml b/services/websocket-gateway-service/k8s-pod.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

diff --git a/services/websocket-gateway-service/package.json b/services/websocket-gateway-service/package.json
@@ -38,7 +38,7 @@
     "moleculer-web": "^0.9.1",
     "nats": "^1.4.0",
     "socket.io": "^2.3.0",
-    "socket.io-redis": "^5.2.0"
+    "socket.io-redis": "^5.3.0"
   },
   "engines": {
     "node": ">= 8.x.x"