Bläddra i källkod

:sparkles: successful planetscale migration and seed test

tags/0.0.3^2
toj 3 år sedan
förälder
incheckning
4ee832cb11
4 ändrade filer med 176 tillägg och 8364 borttagningar
  1. 5
    0
      backend/knexfile.js
  2. 130
    8357
      backend/package-lock.json
  3. 2
    1
      backend/package.json
  4. 39
    6
      backend/server/manifest.js

+ 5
- 0
backend/knexfile.js Visa fil

1
 require('dotenv').config()
1
 require('dotenv').config()
2
+const fs = require('fs')
2
 
3
 
3
 const local = {
4
 const local = {
4
     host: process.env.DB_HOST,
5
     host: process.env.DB_HOST,
8
     port: process.env.DB_PORT,
9
     port: process.env.DB_PORT,
9
 }
10
 }
10
 const pscale = {
11
 const pscale = {
12
+    ssl: true,
11
     host: process.env.PSCALE_DB_HOST ? process.env.PSCALE_DB_HOST : '127.0.0.1',
13
     host: process.env.PSCALE_DB_HOST ? process.env.PSCALE_DB_HOST : '127.0.0.1',
12
     user: process.env.PSCALE_DB_USER ? process.env.PSCALE_DB_USER : 'root',
14
     user: process.env.PSCALE_DB_USER ? process.env.PSCALE_DB_USER : 'root',
13
     password: process.env.PSCALE_DB_PASSWORD
15
     password: process.env.PSCALE_DB_PASSWORD
33
         seeds: {
35
         seeds: {
34
             directory: './db/seeds',
36
             directory: './db/seeds',
35
         },
37
         },
38
+        ssl: {
39
+            ca: fs.readFileSync('/etc/ssl/certs/ca-certificates.crt'),
40
+        },
36
     },
41
     },
37
 }
42
 }

+ 130
- 8357
backend/package-lock.json
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 2
- 1
backend/package.json Visa fil

25
         "@hapipal/confidence": "^6.0.1",
25
         "@hapipal/confidence": "^6.0.1",
26
         "@hapipal/schmervice": "^2.0.0",
26
         "@hapipal/schmervice": "^2.0.0",
27
         "@hapipal/schwifty": "^6.0.0",
27
         "@hapipal/schwifty": "^6.0.0",
28
+        "@planetscale/database": "^1.4.0",
28
         "compute-cosine-similarity": "^1.0.0",
29
         "compute-cosine-similarity": "^1.0.0",
29
         "dotenv": "^10.0.0",
30
         "dotenv": "^10.0.0",
30
         "exiting": "^6.0.1",
31
         "exiting": "^6.0.1",
31
-        "hapi-swagger": "^14.2.5",
32
+        "hapi-swagger": "^14.5.5",
32
         "haversine": "^1.1.1",
33
         "haversine": "^1.1.1",
33
         "joi": "^17.4.0",
34
         "joi": "^17.4.0",
34
         "knex": "^0.21.19",
35
         "knex": "^0.21.19",

+ 39
- 6
backend/server/manifest.js Visa fil

1
-const Dotenv = require('dotenv').config({ path: './server/.env' })
1
+require('dotenv').config()
2
 const Confidence = require('@hapipal/confidence')
2
 const Confidence = require('@hapipal/confidence')
3
 const Inert = require('@hapi/inert')
3
 const Inert = require('@hapi/inert')
4
 const Vision = require('@hapi/vision')
4
 const Vision = require('@hapi/vision')
5
 const Schwifty = require('@hapipal/schwifty')
5
 const Schwifty = require('@hapipal/schwifty')
6
 const HapiSwagger = require('hapi-swagger')
6
 const HapiSwagger = require('hapi-swagger')
7
 
7
 
8
+const confs = {
9
+    local: {
10
+        host: process.env.DB_HOST,
11
+        port: process.env.DB_PORT,
12
+        dbname: process.env.DB_NAME,
13
+        user: process.env.DB_USER,
14
+        pw: process.env.DB_ROOT_PASSWORD,
15
+        ssl: false,
16
+    },
17
+    prod: {
18
+        host: process.env.PSCALE_DB_HOST,
19
+        port: process.env.PSCALE_DB_PORT,
20
+        dbname: process.env.PSCALE_DB_NAME,
21
+        branch: process.env.PSCALE_DB_BRANCH,
22
+        user: process.env.PSCALE_DB_USER,
23
+        pw: process.env.PSCALE_DB_PASSWORD,
24
+        ssl: true,
25
+    },
26
+}
27
+
28
+const current = {
29
+    ssl: process.env.USE_LOCAL_DB == true ? confs.local.ssl : confs.prod.ssl,
30
+    host: process.env.USE_LOCAL_DB == true ? confs.local.host : confs.prod.host,
31
+    port: process.env.USE_LOCAL_DB == true ? confs.local.port : confs.prod.port,
32
+    dbname:
33
+        process.env.USE_LOCAL_DB == true
34
+            ? confs.local.dbname
35
+            : confs.prod.dbname,
36
+    user: process.env.USE_LOCAL_DB == true ? confs.local.user : confs.prod.user,
37
+    pw: process.env.USE_LOCAL_DB == true ? confs.local.pw : confs.prod.pw,
38
+}
39
+
8
 /** Glue manifest as a confidence store */
40
 /** Glue manifest as a confidence store */
9
 module.exports = new Confidence.Store({
41
 module.exports = new Confidence.Store({
10
     server: {
42
     server: {
73
                             client: process.env.DB_TYPE,
105
                             client: process.env.DB_TYPE,
74
                             useNullAsDefault: true,
106
                             useNullAsDefault: true,
75
                             connection: {
107
                             connection: {
76
-                                host: process.env.DB_HOST,
77
-                                user: process.env.DB_USER,
78
-                                password: process.env.DB_ROOT_PASSWORD,
79
-                                database: process.env.DB_NAME,
80
-                                port: process.env.DB_PORT,
108
+                                host: current.host,
109
+                                user: current.user,
110
+                                password: current.pw,
111
+                                database: current.dbname,
112
+                                port: current.port,
113
+                                ssl: current.ssl,
81
                             },
114
                             },
82
                         },
115
                         },
83
                     },
116
                     },

Laddar…
Avbryt
Spara