Skip to content

Commit

Permalink
fix: new connection_string config option for db config #420
Browse files Browse the repository at this point in the history
  • Loading branch information
@dosco
dosco committed Mar 11, 2023
1 parent c647f8a commit 0143f57
Show file tree
Hide file tree
Showing 17 changed files with 296 additions and 95 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN yarn
RUN yarn build

# stage: 2
FROM golang:1.20rc3 as go-build
FROM golang:1.20 as go-build
RUN go install github.com/rafaelsq/wtc@latest

WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BUILD_VERSION ?= $(shell git describe --always --tags)
GOPATH ?= $(shell go env GOPATH)
GOROOT ?= $(shell go env GOROOT)

PACKAGES ?= ./core ./plugin/otel ./serv ./auth ./cmd
PACKAGES ?= ./core ./plugin/otel ./serv ./auth ./cmd ./conf

ifndef GOPATH
override GOPATH = $(HOME)/go
Expand Down
1 change: 1 addition & 0 deletions cmd/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/dosco/graphjin/core/v3"
"github.com/dosco/graphjin/serv/v3"

"github.com/spf13/cobra"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down
9 changes: 3 additions & 6 deletions cmd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ go 1.18
require (
github.com/brianvoe/gofakeit/v6 v6.20.1
github.com/dop251/goja v0.0.0-20230111111035-473251c96b4c
github.com/dosco/graphjin/core/v3 v3.0.0-20230131095039-2864a2e4a4db
github.com/dosco/graphjin/serv/v3 v3.0.0-20230131095039-2864a2e4a4db
github.com/dosco/graphjin/core/v3 v3.0.0-20230204233127-c618c2bad99b
github.com/dosco/graphjin/serv/v3 v3.0.0-20230204233127-c618c2bad99b
github.com/gosimple/slug v1.13.1
github.com/jackc/pgx/v5 v5.2.0
github.com/jvatic/goja-babel v0.0.0-20230111121754-c57c791c6a80
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.6.1
go.mozilla.org/sops/v3 v3.7.3
go.uber.org/zap v1.24.0
golang.org/x/text v0.6.0
)
Expand Down Expand Up @@ -44,13 +43,10 @@ require (
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/dosco/graphjin/auth/v3 v3.0.0-20230128064639-95e7abc910b9 // indirect
github.com/dosco/graphjin/plugin/afero/v3 v3.0.0-20230125090031-062b181a2f0f // indirect
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230127082222-13448e4d7160 // indirect
github.com/dosco/graphjin/plugin/otel/v3 v3.0.0-20230127082222-13448e4d7160 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-chi/chi v1.5.4 // indirect
github.com/go-chi/chi/v5 v5.0.8 // indirect
github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect
github.com/go-logr/logr v1.2.3 // indirect
Expand Down Expand Up @@ -128,6 +124,7 @@ require (
github.com/spf13/viper v1.15.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect
go.mozilla.org/sops/v3 v3.7.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
Expand Down
22 changes: 4 additions & 18 deletions cmd/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,30 +143,18 @@ github.com/dop251/goja v0.0.0-20230111111035-473251c96b4c h1:FdO5s2BNQi5ypAOSPlh
github.com/dop251/goja v0.0.0-20230111111035-473251c96b4c/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
github.com/dosco/graphjin/auth/v3 v3.0.0-20230127082222-13448e4d7160 h1:H8AvshLuo1NVq/FvqPQ6Lv1IhEy0sTnPvBwDFOyyCEE=
github.com/dosco/graphjin/auth/v3 v3.0.0-20230127082222-13448e4d7160/go.mod h1:RYIyGIrtw5lwIsScyL9XNRxX6LGVqv1BazRjgtEpTCk=
github.com/dosco/graphjin/auth/v3 v3.0.0-20230128064639-95e7abc910b9 h1:9Xc2GYlyw7otkB2PQDRdape2fFsdl5/xOEi2LphNX7o=
github.com/dosco/graphjin/auth/v3 v3.0.0-20230128064639-95e7abc910b9/go.mod h1:yxZ/EJNJKAOSkamqT6OAQ5RixWG8AIzcirAhTxlKNtk=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127082222-13448e4d7160 h1:1OTSZXcTzPHGTBtyX3NIuicSlBBofGPN7rs+axyzdqk=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127082222-13448e4d7160/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/dosco/graphjin/core/v3 v3.0.0-20230128064639-95e7abc910b9 h1:Z+1Wu43UcWuYCvsANeKq0hmhGhk/ALigcHHtQNluUDQ=
github.com/dosco/graphjin/core/v3 v3.0.0-20230128064639-95e7abc910b9/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/dosco/graphjin/core/v3 v3.0.0-20230131095039-2864a2e4a4db h1:Y7oO3VIhvREY8zKlbQBKWWs6WtEpomZihf7+0o6n5vQ=
github.com/dosco/graphjin/core/v3 v3.0.0-20230131095039-2864a2e4a4db/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/dosco/graphjin/plugin/afero/v3 v3.0.0-20230125090031-062b181a2f0f h1:fHDgBTvUtKMShr/ZaYibqEmcov0+Yr5JLu0kl9+Jr6g=
github.com/dosco/graphjin/plugin/afero/v3 v3.0.0-20230125090031-062b181a2f0f/go.mod h1:LBuqdgz7Fi9/Wz0iAqSV2FeWu2k5mOBzt+WN/ZJ2pSs=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125090031-062b181a2f0f h1:EBPKpvgo5lb4FJudBcgLZsbZeDD0VcqXzFHC0QWpspY=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125090031-062b181a2f0f/go.mod h1:lg2ZkWi2PmA8d8t0vL7fgyFc1bKAkSIb6sWnOWmaseQ=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230127082222-13448e4d7160 h1:E5TTZbVxsp31LkvNosi9gqarp95Hh6fRwKqAVMn0keo=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230127082222-13448e4d7160/go.mod h1:lg2ZkWi2PmA8d8t0vL7fgyFc1bKAkSIb6sWnOWmaseQ=
github.com/dosco/graphjin/core/v3 v3.0.0-20230204233127-c618c2bad99b h1:zxtoXgxlq22BS8MeI23inoZBAmGmRO/xkJBPnKg4q/g=
github.com/dosco/graphjin/core/v3 v3.0.0-20230204233127-c618c2bad99b/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/dosco/graphjin/plugin/otel/v3 v3.0.0-20230127082222-13448e4d7160 h1:XYXEOW8yUXdB6Pc3J3EVtZ5LzP91UV8siKEB7G25ryc=
github.com/dosco/graphjin/plugin/otel/v3 v3.0.0-20230127082222-13448e4d7160/go.mod h1:fnsF4DMvvl5Duh+wQVBOgTUqSYc8Wi+4dXQZxHGL9pI=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230127082222-13448e4d7160 h1:cUNRW3AYbENvdNeU4akIotUIsnmlLw9lVu5JtzE9j/w=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230127082222-13448e4d7160/go.mod h1:pEhXC+N5pX/G8CeNMEfkQVzed9THcuAqopU5PssWNws=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230128064639-95e7abc910b9 h1:oqqR1tu7Q6VsTM7p5W9VVSdVW5CH6m+e7bknwrkHFqY=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230128064639-95e7abc910b9/go.mod h1:ZyjQFjtT2ZvqpBJbQv3W2R5cDJvDYg9ny8DjMQ4HyJE=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230131095039-2864a2e4a4db h1:u9YE6B7T39Pc9y2r/0dNmMB2ZJrl924Am+PQxgVbVg0=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230131095039-2864a2e4a4db/go.mod h1:pQ1NRhs+dZV6G2hwRuELGrkH3zozXOnWDx0VDSmaGSQ=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230204233127-c618c2bad99b h1:PQplT827xgw4Ezd62MPu+YKfPbwPIC680uhTTkwyb/o=
github.com/dosco/graphjin/serv/v3 v3.0.0-20230204233127-c618c2bad99b/go.mod h1:pQ1NRhs+dZV6G2hwRuELGrkH3zozXOnWDx0VDSmaGSQ=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand All @@ -189,8 +177,6 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
Expand Down
3 changes: 3 additions & 0 deletions cmd/tmpl/dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ database:
password: {{ .DBPass }}
#schema: "public"

# alternatively you can use a connection string
#connection_string: postgres://jack:secret@pg.example.com:5432/mydb?sslmode=verify-ca&pool_max_conns=10

# Size of database connection pool
# pool_size: 15

Expand Down
2 changes: 1 addition & 1 deletion docker-push.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ inspect=`docker images -q dosco/graphjin:$version 2> /dev/null`
# fi

# docker login
env KO_DOCKER_REPO=dosco/graphjin ko build --bare --tags=$version,latest --platform=linux/amd64,linux/arm64 .
env KO_DOCKER_REPO=dosco/graphjin ko build --bare --tags=$version,latest --platform=linux/amd64,linux/arm64 ./cmd
3 changes: 3 additions & 0 deletions examples/webshop/config/dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ database:
user: postgres
password: postgres

# alternatively you can use a connection string
#connection_string: postgres://jack:secret@pg.example.com:5432/mydb?sslmode=verify-ca&pool_max_conns=10

#schema: "public"
#pool_size: 10
#max_retries: 0
Expand Down
1 change: 1 addition & 0 deletions go.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ use (
./serv
./auth
./cmd
./wasm
./plugin/otel
)
Loading

1 comment on commit 0143f57

@vercel
Copy link

@vercel vercel bot commented on 0143f57 Mar 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

graphjin – ./

graphjin-git-master-dosco.vercel.app
graphjin.vercel.app
graphjin-dosco.vercel.app
graphjin.com
www.graphjin.com

Please sign in to comment.