Skip to content

Commit

Permalink
Up github.com/lib/pq version to enable SNI support
Browse files Browse the repository at this point in the history
  • Loading branch information
absorbb committed Oct 16, 2023
1 parent 73a52ca commit 11be8a5
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 5 deletions.
4 changes: 2 additions & 2 deletions configurator/backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ require (
github.com/carlmjohnson/requests v0.22.1
github.com/coreos/go-oidc v2.1.0+incompatible
github.com/deepmap/oapi-codegen v1.10.1
github.com/gin-contrib/sessions v0.0.5
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
github.com/gin-gonic/gin v1.7.7
github.com/go-acme/lego v2.7.2+incompatible
github.com/go-playground/validator/v10 v10.11.0
github.com/gomodule/redigo v2.0.0+incompatible
github.com/hashicorp/go-multierror v1.1.0
github.com/jitsucom/jitsu/server v1.37.3
github.com/lib/pq v1.10.3
github.com/lib/pq v1.10.9
github.com/mitchellh/mapstructure v1.4.1
github.com/pkg/errors v0.9.1
github.com/satori/go.uuid v1.2.0
Expand Down Expand Up @@ -71,6 +70,7 @@ require (
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gabriel-vasile/mimetype v1.4.0 // indirect
github.com/gin-contrib/sessions v0.0.5 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-playground/locales v0.14.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions configurator/backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
Expand Down Expand Up @@ -730,6 +732,8 @@ github.com/lestrrat-go/jwx v1.2.23/go.mod h1:sAXjRwzSvCN6soO4RLoWWm1bVPpb8iOuv0I
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/lyft/protoc-gen-star v0.5.2/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU=
Expand Down
2 changes: 1 addition & 1 deletion server/drivers/google_ads/google_ads.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func NewGoogleAds(ctx context.Context, sourceConfig *base.SourceConfig, collecti
return nil, fmt.Errorf("Unknown collection [%s]", collection.Type)
}
where := reportConfig.Where
where = strings.ReplaceAll(strings.ToLower(where), "where", "")
where = strings.TrimPrefix(strings.ToLower(where), "where")
fields := strings.Split(strings.ReplaceAll(reportConfig.Fields, " ", ""), ",")

granularity := schema.ALL
Expand Down
4 changes: 2 additions & 2 deletions server/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/gin-gonic/gin v1.7.3
github.com/go-redsync/redsync/v4 v4.5.0
github.com/go-sql-driver/mysql v1.6.0
github.com/gomodule/redigo v1.8.8
github.com/gomodule/redigo v1.8.9
github.com/google/go-cmp v0.5.9
github.com/google/go-github/v32 v32.1.0
github.com/google/go-querystring v1.1.0 // indirect
Expand All @@ -28,7 +28,7 @@ require (
github.com/huandu/facebook/v2 v2.5.3
github.com/iancoleman/strcase v0.2.0
github.com/jarcoal/httpmock v1.1.0
github.com/lib/pq v1.10.2
github.com/lib/pq v1.10.9
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/mailru/go-clickhouse v1.8.0
github.com/mitchellh/hashstructure/v2 v2.0.2
Expand Down
Loading

0 comments on commit 11be8a5

Please sign in to comment.