Skip to content

Commit 9d7c9c5

Browse files
soedirgosoedirgo
committed
fix: ssl sadness
1 parent fa617a3 commit 9d7c9c5

15 files changed

+83
-66
lines changed

‎package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"build:module": "tsc -p tsconfig.module.json && cpy 'src/lib/sql/*.sql' dist/module/sql",
2121
"build:server": "tsc -p tsconfig.server.json && cpy 'src/lib/sql/*.sql' bin/src/lib/sql",
2222
"docs:export": "PG_META_EXPORT_DOCS=true ts-node-dev src/server/app.ts",
23-
"start": "ts-node-dev src/server/app.ts | pino-pretty --colorize",
23+
"start": "NODE_ENV=development ts-node-dev src/server/app.ts | pino-pretty --colorize",
2424
"dev": "run-s clean format start",
2525
"pkg": "run-s clean format build:server && pkg --out-path bin .pkg.config.json",
2626
"test": "run-s build:server && node -r esm ./node_modules/.bin/mocha 'test/**/*.js' --recursive"
@@ -31,7 +31,7 @@
3131
},
3232
"dependencies": {
3333
"@sinclair/typebox": "^0.19.2",
34-
"pg": "^8.6.0",
34+
"pg": "^8.7.1",
3535
"pg-format": "^1.0.4"
3636
},
3737
"devDependencies": {

‎src/server/constants.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ const PG_META_DB_PASSWORD = process.env.PG_META_DB_PASSWORD || 'postgres'
1010
export const PG_CONNECTION = `postgres://${PG_META_DB_USER}:${PG_META_DB_PASSWORD}@${PG_META_DB_HOST}:${PG_META_DB_PORT}/${PG_META_DB_NAME}`
1111

1212
export const PG_META_EXPORT_DOCS = process.env.PG_META_EXPORT_DOCS === 'true' || false
13+
14+
export const DEFAULT_POOL_CONFIG =
15+
process.env.NODE_ENV === 'development'
16+
? { max: 1, ssl: false }
17+
: { max: 1, ssl: { rejectUnauthorized: false } }

‎src/server/routes/columns.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
@@ -11,7 +12,7 @@ export default async (fastify: FastifyInstance) => {
1112
const connectionString = request.headers.pg
1213
const includeSystemSchemas = request.query.include_system_schemas === 'true'
1314

14-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
15+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1516
const { data, error } = await pgMeta.columns.list({
1617
includeSystemSchemas,
1718
})
@@ -33,7 +34,7 @@ export default async (fastify: FastifyInstance) => {
3334
}>('/:id(\\d+\\.\\d+)', async (request, reply) => {
3435
const connectionString = request.headers.pg
3536

36-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
37+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
3738
const { data, error } = await pgMeta.columns.retrieve({ id: request.params.id })
3839
await pgMeta.end()
3940
if (error) {
@@ -52,7 +53,7 @@ export default async (fastify: FastifyInstance) => {
5253
}>('/', async (request, reply) => {
5354
const connectionString = request.headers.pg
5455

55-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
56+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
5657
const { data, error } = await pgMeta.columns.create(request.body)
5758
await pgMeta.end()
5859
if (error) {
@@ -74,7 +75,7 @@ export default async (fastify: FastifyInstance) => {
7475
}>('/:id(\\d+\\.\\d+)', async (request, reply) => {
7576
const connectionString = request.headers.pg
7677

77-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
78+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
7879
const { data, error } = await pgMeta.columns.update(request.params.id, request.body)
7980
await pgMeta.end()
8081
if (error) {
@@ -98,7 +99,7 @@ export default async (fastify: FastifyInstance) => {
9899
}>('/:id(\\d+\\.\\d+)', async (request, reply) => {
99100
const connectionString = request.headers.pg
100101

101-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
102+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
102103
const { data, error } = await pgMeta.columns.remove(request.params.id)
103104
await pgMeta.end()
104105
if (error) {

‎src/server/routes/config.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
67
Headers: { pg: string }
78
}>('/', async (request, reply) => {
89
const connectionString = request.headers.pg
910

10-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
11+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1112
const { data, error } = await pgMeta.config.list()
1213
await pgMeta.end()
1314
if (error) {
@@ -24,7 +25,7 @@ export default async (fastify: FastifyInstance) => {
2425
}>('/version', async (request, reply) => {
2526
const connectionString = request.headers.pg
2627

27-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
28+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
2829
const { data, error } = await pgMeta.version.retrieve()
2930
await pgMeta.end()
3031
if (error) {

‎src/server/routes/extensions.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
67
Headers: { pg: string }
78
}>('/', async (request, reply) => {
89
const connectionString = request.headers.pg
910

10-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
11+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1112
const { data, error } = await pgMeta.extensions.list()
1213
await pgMeta.end()
1314
if (error) {
@@ -27,7 +28,7 @@ export default async (fastify: FastifyInstance) => {
2728
}>('/:name', async (request, reply) => {
2829
const connectionString = request.headers.pg
2930

30-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
31+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
3132
const { data, error } = await pgMeta.extensions.retrieve({ name: request.params.name })
3233
await pgMeta.end()
3334
if (error) {
@@ -45,7 +46,7 @@ export default async (fastify: FastifyInstance) => {
4546
}>('/', async (request, reply) => {
4647
const connectionString = request.headers.pg
4748

48-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
49+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
4950
const { data, error } = await pgMeta.extensions.create(request.body)
5051
await pgMeta.end()
5152
if (error) {
@@ -66,7 +67,7 @@ export default async (fastify: FastifyInstance) => {
6667
}>('/:name', async (request, reply) => {
6768
const connectionString = request.headers.pg
6869

69-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
70+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
7071
const { data, error } = await pgMeta.extensions.update(request.params.name, request.body)
7172
await pgMeta.end()
7273
if (error) {
@@ -91,7 +92,7 @@ export default async (fastify: FastifyInstance) => {
9192
const connectionString = request.headers.pg
9293
const cascade = request.query.cascade === 'true'
9394

94-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
95+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
9596
const { data, error } = await pgMeta.extensions.remove(request.params.name, { cascade })
9697
await pgMeta.end()
9798
if (error) {

‎src/server/routes/functions.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
@@ -11,7 +12,7 @@ export default async (fastify: FastifyInstance) => {
1112
const connectionString = request.headers.pg
1213
const includeSystemSchemas = request.query.include_system_schemas === 'true'
1314

14-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
15+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1516
const { data, error } = await pgMeta.functions.list({ includeSystemSchemas })
1617
await pgMeta.end()
1718
if (error) {
@@ -32,7 +33,7 @@ export default async (fastify: FastifyInstance) => {
3233
const connectionString = request.headers.pg
3334
const id = Number(request.params.id)
3435

35-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
36+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
3637
const { data, error } = await pgMeta.functions.retrieve({ id })
3738
await pgMeta.end()
3839
if (error) {
@@ -50,7 +51,7 @@ export default async (fastify: FastifyInstance) => {
5051
}>('/', async (request, reply) => {
5152
const connectionString = request.headers.pg
5253

53-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
54+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
5455
const { data, error } = await pgMeta.functions.create(request.body)
5556
await pgMeta.end()
5657
if (error) {
@@ -71,7 +72,7 @@ export default async (fastify: FastifyInstance) => {
7172
const connectionString = request.headers.pg
7273
const id = Number(request.params.id)
7374

74-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
75+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
7576
const { data, error } = await pgMeta.functions.update(id, request.body)
7677
await pgMeta.end()
7778
if (error) {
@@ -92,7 +93,7 @@ export default async (fastify: FastifyInstance) => {
9293
const connectionString = request.headers.pg
9394
const id = Number(request.params.id)
9495

95-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
96+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
9697
const { data, error } = await pgMeta.functions.remove(id)
9798
await pgMeta.end()
9899
if (error) {

‎src/server/routes/policies.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
@@ -11,7 +12,7 @@ export default async (fastify: FastifyInstance) => {
1112
const connectionString = request.headers.pg
1213
const includeSystemSchemas = request.query.include_system_schemas === 'true'
1314

14-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
15+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1516
const { data, error } = await pgMeta.policies.list({ includeSystemSchemas })
1617
await pgMeta.end()
1718
if (error) {
@@ -32,7 +33,7 @@ export default async (fastify: FastifyInstance) => {
3233
const connectionString = request.headers.pg
3334
const id = Number(request.params.id)
3435

35-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
36+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
3637
const { data, error } = await pgMeta.policies.retrieve({ id })
3738
await pgMeta.end()
3839
if (error) {
@@ -50,7 +51,7 @@ export default async (fastify: FastifyInstance) => {
5051
}>('/', async (request, reply) => {
5152
const connectionString = request.headers.pg
5253

53-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
54+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
5455
const { data, error } = await pgMeta.policies.create(request.body)
5556
await pgMeta.end()
5657
if (error) {
@@ -72,7 +73,7 @@ export default async (fastify: FastifyInstance) => {
7273
const connectionString = request.headers.pg
7374
const id = Number(request.params.id)
7475

75-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
76+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
7677
const { data, error } = await pgMeta.policies.update(id, request.body)
7778
await pgMeta.end()
7879
if (error) {
@@ -94,7 +95,7 @@ export default async (fastify: FastifyInstance) => {
9495
const connectionString = request.headers.pg
9596
const id = Number(request.params.id)
9697

97-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
98+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
9899
const { data, error } = await pgMeta.policies.remove(id)
99100
await pgMeta.end()
100101
if (error) {

‎src/server/routes/publications.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { FastifyInstance } from 'fastify'
22
import { PostgresMeta } from '../../lib'
3+
import { DEFAULT_POOL_CONFIG } from '../constants'
34

45
export default async (fastify: FastifyInstance) => {
56
fastify.get<{
67
Headers: { pg: string }
78
}>('/', async (request, reply) => {
89
const connectionString = request.headers.pg
910

10-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
11+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
1112
const { data, error } = await pgMeta.publications.list()
1213
await pgMeta.end()
1314
if (error) {
@@ -28,7 +29,7 @@ export default async (fastify: FastifyInstance) => {
2829
const connectionString = request.headers.pg
2930
const id = Number(request.params.id)
3031

31-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
32+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
3233
const { data, error } = await pgMeta.publications.retrieve({ id })
3334
await pgMeta.end()
3435
if (error) {
@@ -46,7 +47,7 @@ export default async (fastify: FastifyInstance) => {
4647
}>('/', async (request, reply) => {
4748
const connectionString = request.headers.pg
4849

49-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
50+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
5051
const { data, error } = await pgMeta.publications.create(request.body)
5152
await pgMeta.end()
5253
if (error) {
@@ -68,7 +69,7 @@ export default async (fastify: FastifyInstance) => {
6869
const connectionString = request.headers.pg
6970
const id = Number(request.params.id)
7071

71-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
72+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
7273
const { data, error } = await pgMeta.publications.update(id, request.body)
7374
await pgMeta.end()
7475
if (error) {
@@ -90,7 +91,7 @@ export default async (fastify: FastifyInstance) => {
9091
const connectionString = request.headers.pg
9192
const id = Number(request.params.id)
9293

93-
const pgMeta = new PostgresMeta({ connectionString, max: 1 })
94+
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
9495
const { data, error } = await pgMeta.publications.remove(id)
9596
await pgMeta.end()
9697
if (error) {

0 commit comments

Comments
 (0)