chore(core-database-postgres): use token in database name (#1992)

ArkEcosystem · Jan 18, 2019 · ea4f775 · ea4f775
1 parent aa0718e
commit ea4f775
Show file tree

Hide file tree

Showing 28 changed files with 102 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,6 +2,9 @@ version: 2
 jobs:
   test-node10-0:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:10-browsers'
       - image: 'postgres:alpine'
@@ -95,6 +98,9 @@ jobs:
           command: ./node_modules/.bin/codecov
   test-node11-0:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:11-browsers'
       - image: 'postgres:alpine'
@@ -188,6 +194,9 @@ jobs:
           command: ./node_modules/.bin/codecov
   test-node10-1:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:10-browsers'
       - image: 'postgres:alpine'
@@ -287,6 +296,9 @@ jobs:
           command: ./node_modules/.bin/codecov
   test-node10-2:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:10-browsers'
       - image: 'postgres:alpine'
@@ -383,6 +395,9 @@ jobs:
           command: ./node_modules/.bin/codecov
   test-node11-1:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:11-browsers'
       - image: 'postgres:alpine'
@@ -482,6 +497,9 @@ jobs:
           command: ./node_modules/.bin/codecov
   test-node11-2:
     working_directory: ~/core
+    environment:
+      CORE_DB_DATABASE: core_development
+      CORE_DB_USERNAME: core
     docker:
       - image: 'circleci/node:11-browsers'
       - image: 'postgres:alpine'

diff --git a/.circleci/configTemplate.json b/.circleci/configTemplate.json
@@ -3,6 +3,10 @@
     "jobs": {
         "test-node10-0": {
             "working_directory": "~/core",
+            "environment": {
+                "CORE_DB_DATABASE": "core_development",
+                "CORE_DB_USERNAME": "core"
+            },
             "docker": [
                 {
                     "image": "circleci/node:10-browsers"
@@ -82,6 +86,10 @@
         },
         "test-node11-0": {
             "working_directory": "~/core",
+            "environment": {
+                "CORE_DB_DATABASE": "core_development",
+                "CORE_DB_USERNAME": "core"
+            },
             "docker": [
                 {
                     "image": "circleci/node:11-browsers"

diff --git a/package.json b/package.json
@@ -16,7 +16,8 @@
         "snyk": "./node_modules/.bin/snyk protect",
         "version": "cross-env-shell ./scripts/version.sh",
         "release": "cross-env-shell ./scripts/release.sh",
-        "updates": "yarn lerna run updates"
+        "updates": "yarn lerna run updates",
+        "generateDocker": "node ./scripts/docker/generate-docker.js"
     },
     "devDependencies": {
         "@babel/core": "^7.2.2",

diff --git a/packages/core-container/src/container.ts b/packages/core-container/src/container.ts
@@ -239,8 +239,10 @@ export class Container implements container.IContainer {
             this.shuttingDown = true;
 
             const logger = this.resolvePlugin<Logger.ILogger>("logger");
-            logger.suppressConsoleOutput(this.silentShutdown);
-            logger.info("Ark Core is trying to gracefully shut down to avoid data corruption :pizza:");
+            if (logger) {
+                logger.suppressConsoleOutput(this.silentShutdown);
+                logger.info("Core is trying to gracefully shut down to avoid data corruption :pizza:");
+            }
 
             try {
                 /* TODO: core-database-postgres has a dep on core-container. Yet we have code in core-container fetching a reference to core-database-postgres.

diff --git a/packages/core-container/src/environment.ts b/packages/core-container/src/environment.ts
@@ -47,6 +47,8 @@ export class Environment {
      * @return {void}
      */
     private exportVariables() {
+        process.env.CORE_TOKEN = this.variables.token;
+
         // Don't pollute the test environment!
         if (process.env.NODE_ENV === "test") {
             return;

diff --git a/packages/core-database-postgres/src/defaults.ts b/packages/core-database-postgres/src/defaults.ts
@@ -7,8 +7,8 @@ export const defaults = {
     connection: {
         host: process.env.CORE_DB_HOST || "localhost",
         port: process.env.CORE_DB_PORT || 5432,
-        database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}`,
-        user: process.env.CORE_DB_USERNAME || "core",
+        database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}`,
+        user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
         password: process.env.CORE_DB_PASSWORD || "password",
     },
 };
diff --git a/packages/core-test-utils/src/config/testnet/plugins.js b/packages/core-test-utils/src/config/testnet/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || "core_development",
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_development`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core-test-utils/src/config/unitnet/plugins.js b/packages/core-test-utils/src/config/unitnet/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || "core_development",
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_development`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/devnet/plugins.js b/packages/core/src/config/devnet/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/mainnet/plugins.js b/packages/core/src/config/mainnet/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/testnet.1/plugins.js b/packages/core/src/config/testnet.1/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}1`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}1`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/testnet.2/plugins.js b/packages/core/src/config/testnet.2/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}2`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}2`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/testnet.live/plugins.js b/packages/core/src/config/testnet.live/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}live`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}live`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/packages/core/src/config/testnet/plugins.js b/packages/core/src/config/testnet/plugins.js
@@ -18,8 +18,8 @@ module.exports = {
         connection: {
             host: process.env.CORE_DB_HOST || "localhost",
             port: process.env.CORE_DB_PORT || 5432,
-            database: process.env.CORE_DB_DATABASE || `core_${process.env.CORE_NETWORK_NAME}`,
-            user: process.env.CORE_DB_USERNAME || "core",
+            database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_${process.env.CORE_NETWORK_NAME}`,
+            user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN,
             password: process.env.CORE_DB_PASSWORD || "password",
         },
     },

diff --git a/scripts/docker/generate-docker.js b/scripts/docker/generate-docker.js
@@ -0,0 +1,28 @@
+const fs = require("fs");
+const { ensureDirSync } = require("fs-extra");
+
+const regex = new RegExp("{token}", "g");
+const templateRoot = './scripts/docker/templates'
+const templateDirs = fs.readdirSync(templateRoot);
+
+if (process.argv.length !== 3) {
+    throw new Error("Expected 1 argument for the token name");
+}
+
+const token = process.argv[2];
+
+console.log(`Generating docker files for '${token}':`)
+
+templateDirs.forEach(templateDir => {
+    ensureDirSync(`./docker/${templateDir}`)
+    const templateFiles = fs.readdirSync(`${templateRoot}/${templateDir}`)
+    templateFiles.forEach(templateFile => {
+        const template = fs.readFileSync(`${templateRoot}/${templateDir}/${templateFile}`, { encoding: "utf8" })
+        const target = `./docker/${templateDir}/${templateFile}`
+        console.log(`${target}`)
+        fs.writeFileSync(target, template.replace(regex, token));
+        if (templateFile.endsWith(".sh")) {
+            fs.chmodSync(target, "755");
+        }
+    })
+})
diff --git a/docker/mainnet/docker-compose.yml → .../templates/development/docker-compose.yml b/docker/mainnet/docker-compose.yml → .../templates/development/docker-compose.yml
@@ -6,15 +6,15 @@ services:
 
   postgres:
     image: "postgres:alpine"
-    container_name: core-mainnet-postgres
+    container_name: {token}-development-postgres
     ports:
       - '127.0.0.1:5432:5432'
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
      POSTGRES_PASSWORD: password
-     POSTGRES_DB: core_mainnet
-     POSTGRES_USER: core
+     POSTGRES_DB: {token}_development
+     POSTGRES_USER: {token}
 
 volumes:
   postgres:
diff --git a/docker/development/purge.sh → ...pts/docker/templates/development/purge.sh b/docker/development/purge.sh → ...pts/docker/templates/development/purge.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-docker stop ark-development-postgres
-docker rm -v ark-development-postgres
+docker stop {token}-development-postgres
+docker rm -v {token}-development-postgres
 docker volume rm development_postgres
 docker network rm development_default
diff --git a/docker/devnet/Dockerfile → scripts/docker/templates/devnet/Dockerfile b/docker/devnet/Dockerfile → scripts/docker/templates/devnet/Dockerfile
diff --git a/docker/devnet/docker-compose.yml → ...ocker/templates/devnet/docker-compose.yml b/docker/devnet/docker-compose.yml → ...ocker/templates/devnet/docker-compose.yml
@@ -3,20 +3,20 @@ services:
 
   postgres:
     image: "postgres:alpine"
-    container_name: core-devnet-postgres
+    container_name: {token}-devnet-postgres
     ports:
       - '127.0.0.1:5432:5432'
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
      POSTGRES_PASSWORD: password
-     POSTGRES_DB: core_devnet
-     POSTGRES_USER: core
+     POSTGRES_DB: {token}_devnet
+     POSTGRES_USER: {token}
 
   core:
     build: .
     image: core
-    container_name: core-devnet-core
+    container_name: {token}-devnet-core
     ports:
      - "4002:4002"
      - "4003:4003"

diff --git a/docker/testnet/entrypoint.sh → ...pts/docker/templates/devnet/entrypoint.sh b/docker/testnet/entrypoint.sh → ...pts/docker/templates/devnet/entrypoint.sh
@@ -2,8 +2,8 @@
 
 sysctl -w net.ipv4.conf.all.route_localnet=1
 
-POSTGRES=$(ping -c 1 ark-testnet-postgres | awk -F'[()]' '/PING/{print $2}')
-CORE=$(ping -c 1 ark-testnet-core | awk -F'[()]' '/PING/{print $2}')
+POSTGRES=$(ping -c 1 {token}-devnet-postgres | awk -F'[()]' '/PING/{print $2}')
+CORE=$(ping -c 1 {token}-devnet-core | awk -F'[()]' '/PING/{print $2}')
 
 iptables -I OUTPUT -t nat -o lo -d localhost -p tcp --dport 5432 -j DNAT --to-destination ${POSTGRES}:5432
 iptables -I POSTROUTING -t nat -p tcp --dport 5432 -d ${POSTGRES} -j SNAT --to ${CORE}

diff --git a/docker/devnet/purge_all.sh → scripts/docker/templates/devnet/purge_all.sh b/docker/devnet/purge_all.sh → scripts/docker/templates/devnet/purge_all.sh
diff --git a/docker/testnet/restore.sh → scripts/docker/templates/devnet/restore.sh b/docker/testnet/restore.sh → scripts/docker/templates/devnet/restore.sh
@@ -1,6 +1,6 @@
 DOCKER_DB_NAME="$(docker-compose ps -q postgres)"
 DB_HOSTNAME=postgres
-DB_USER=ark
+DB_USER={token}
 LOCAL_DUMP_PATH="snapshot.dump"
 
 docker-compose up -d postgres

diff --git a/docker/development/docker-compose.yml → ...cker/templates/mainnet/docker-compose.yml b/docker/development/docker-compose.yml → ...cker/templates/mainnet/docker-compose.yml
@@ -6,15 +6,15 @@ services:
 
   postgres:
     image: "postgres:alpine"
-    container_name: core-development-postgres
+    container_name: {token}-mainnet-postgres
     ports:
       - '127.0.0.1:5432:5432'
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
      POSTGRES_PASSWORD: password
-     POSTGRES_DB: core_development
-     POSTGRES_USER: core
+     POSTGRES_DB: {token}_mainnet
+     POSTGRES_USER: {token}
 
 volumes:
   postgres:
diff --git a/docker/testnet/Dockerfile → scripts/docker/templates/testnet/Dockerfile b/docker/testnet/Dockerfile → scripts/docker/templates/testnet/Dockerfile
diff --git a/docker/testnet/docker-compose.yml → ...cker/templates/testnet/docker-compose.yml b/docker/testnet/docker-compose.yml → ...cker/templates/testnet/docker-compose.yml
@@ -3,20 +3,20 @@ services:
 
   postgres:
     image: "postgres:alpine"
-    container_name: core-testnet-postgres
+    container_name: {token}-testnet-postgres
     ports:
       - '127.0.0.1:5432:5432'
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
      POSTGRES_PASSWORD: password
-     POSTGRES_DB: core_testnet
-     POSTGRES_USER: core
+     POSTGRES_DB: {token}_testnet
+     POSTGRES_USER: {token}
 
   core:
     build: .
     image: core
-    container_name: core-testnet-core
+    container_name: {token}-testnet-core
     ports:
      - "4000:4000"
      - "4003:4003"

diff --git a/docker/devnet/entrypoint.sh → ...ts/docker/templates/testnet/entrypoint.sh b/docker/devnet/entrypoint.sh → ...ts/docker/templates/testnet/entrypoint.sh
@@ -2,8 +2,8 @@
 
 sysctl -w net.ipv4.conf.all.route_localnet=1
 
-POSTGRES=$(ping -c 1 ark-devnet-postgres | awk -F'[()]' '/PING/{print $2}')
-CORE=$(ping -c 1 ark-devnet-core | awk -F'[()]' '/PING/{print $2}')
+POSTGRES=$(ping -c 1 {token}-testnet-postgres | awk -F'[()]' '/PING/{print $2}')
+CORE=$(ping -c 1 {token}-testnet-core | awk -F'[()]' '/PING/{print $2}')
 
 iptables -I OUTPUT -t nat -o lo -d localhost -p tcp --dport 5432 -j DNAT --to-destination ${POSTGRES}:5432
 iptables -I POSTROUTING -t nat -p tcp --dport 5432 -d ${POSTGRES} -j SNAT --to ${CORE}

diff --git a/docker/testnet/purge_all.sh → ...pts/docker/templates/testnet/purge_all.sh b/docker/testnet/purge_all.sh → ...pts/docker/templates/testnet/purge_all.sh
diff --git a/docker/devnet/restore.sh → scripts/docker/templates/testnet/restore.sh b/docker/devnet/restore.sh → scripts/docker/templates/testnet/restore.sh
@@ -1,6 +1,6 @@
 DOCKER_DB_NAME="$(docker-compose ps -q postgres)"
 DB_HOSTNAME=postgres
-DB_USER=ark
+DB_USER={token}
 LOCAL_DUMP_PATH="snapshot.dump"
 
 docker-compose up -d postgres