Skip to content

Commit cec1719

Browse files
monstermunchkinmonstermunchkin
committed
*: Use updated dependencies
1 parent 1d673d3 commit cec1719

25 files changed

Lines changed: 111 additions & 127 deletions

File tree

‎backend/couchdb/db.go‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,33 @@
33
package couchdb
44

55
import (
6-
"context"
6+
"net/http"
77

8-
"github.com/caarlos0/env/v10"
9-
"github.com/go-kivik/couchdb/v3"
10-
kivik "github.com/go-kivik/kivik/v3"
8+
"github.com/caarlos0/env/v11"
9+
kivik "github.com/go-kivik/kivik/v4"
10+
"github.com/go-kivik/kivik/v4/couchdb"
1111

1212
"github.com/pace/bricks/http/transport"
1313
"github.com/pace/bricks/maintenance/health/servicehealthcheck"
14-
"github.com/pace/bricks/maintenance/log"
1514
)
1615

1716
func DefaultDatabase() (*kivik.DB, error) {
1817
return Database("")
1918
}
2019

2120
func Database(name string) (*kivik.DB, error) {
22-
ctx := log.WithContext(context.Background())
23-
2421
cfg, err := ParseConfig()
2522
if err != nil {
2623
return nil, err
2724
}
2825
// Primary client+db
29-
_, db, err := clientAndDB(ctx, name, cfg)
26+
_, db, err := clientAndDB(name, cfg)
3027
if err != nil {
3128
return nil, err
3229
}
3330

3431
// Secondary (healthcheck) client+db
35-
healthCheckClient, healthCheckDB, err := clientAndDB(ctx, name, cfg)
32+
healthCheckClient, healthCheckDB, err := clientAndDB(name, cfg)
3633
if err != nil {
3734
return nil, err
3835
}
@@ -49,7 +46,7 @@ func Database(name string) (*kivik.DB, error) {
4946
return db, nil
5047
}
5148

52-
func clientAndDB(ctx context.Context, dbName string, cfg *Config) (*kivik.Client, *kivik.DB, error) {
49+
func clientAndDB(dbName string, cfg *Config) (*kivik.Client, *kivik.DB, error) {
5350
client, err := Client(cfg)
5451
if err != nil {
5552
return nil, nil, err
@@ -60,20 +57,14 @@ func clientAndDB(ctx context.Context, dbName string, cfg *Config) (*kivik.Client
6057
dbName = cfg.Database
6158
}
6259

63-
db := client.DB(ctx, dbName, nil)
60+
db := client.DB(dbName)
6461
if db.Err() != nil {
6562
return nil, nil, db.Err()
6663
}
6764
return client, db, err
6865
}
6966

7067
func Client(cfg *Config) (*kivik.Client, error) {
71-
ctx := log.WithContext(context.Background())
72-
73-
client, err := kivik.New("couch", cfg.URL)
74-
if err != nil {
75-
return nil, err
76-
}
7768
rts := []transport.ChainableRoundTripper{
7869
&AuthTransport{
7970
Username: cfg.User,
@@ -84,9 +75,8 @@ func Client(cfg *Config) (*kivik.Client, error) {
8475
if !cfg.DisableRequestLogging {
8576
rts = append(rts, &transport.LoggingRoundTripper{})
8677
}
87-
chain := transport.Chain(rts...)
88-
tr := couchdb.SetTransport(chain)
89-
err = client.Authenticate(ctx, tr)
78+
79+
client, err := kivik.New("couch", cfg.URL, couchdb.OptionHTTPClient(&http.Client{Transport: transport.Chain(rts...)}))
9080
if err != nil {
9181
return nil, err
9282
}

‎backend/couchdb/health_check.go‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"time"
88

9-
kivik "github.com/go-kivik/kivik/v3"
9+
kivik "github.com/go-kivik/kivik/v4"
1010
"github.com/pace/bricks/maintenance/health/servicehealthcheck"
1111
)
1212

@@ -37,9 +37,12 @@ func (h *HealthCheck) HealthCheck(ctx context.Context) servicehealthcheck.Health
3737

3838
checkTime := time.Now()
3939

40-
var doc Doc
41-
var err error
42-
var row *kivik.Row
40+
var (
41+
doc Doc
42+
err error
43+
row *kivik.Document
44+
rev string
45+
)
4346

4447
check:
4548
// check if context was canceled
@@ -51,20 +54,25 @@ check:
5154
}
5255

5356
row = h.DB.Get(ctx, h.Config.HealthCheckKey)
54-
if row.Err != nil {
55-
if kivik.StatusCode(row.Err) == http.StatusNotFound {
57+
if err := row.Err(); err != nil {
58+
if kivik.HTTPStatus(err) == http.StatusNotFound {
5659
goto put
5760
}
58-
h.state.SetErrorState(fmt.Errorf("failed to get: %#v", row.Err))
61+
h.state.SetErrorState(fmt.Errorf("failed to get: %#v", err))
5962
return h.state.GetState()
6063
}
61-
defer row.Body.Close()
64+
defer row.Close()
6265

6366
// check if document exists
64-
if row.Rev != "" {
67+
rev, err = row.Rev()
68+
if err != nil {
69+
h.state.SetErrorState(fmt.Errorf("failed to get document revision: %v", err))
70+
}
71+
72+
if rev != "" {
6573
err = row.ScanDoc(&doc)
6674
if err != nil {
67-
h.state.SetErrorState(fmt.Errorf("failed to get: %v", row.Err))
75+
h.state.SetErrorState(fmt.Errorf("failed to get: %v", err))
6876
return h.state.GetState()
6977
}
7078

@@ -81,7 +89,7 @@ put:
8189
_, err = h.DB.Put(ctx, h.Config.HealthCheckKey, doc)
8290
if err != nil {
8391
// not yet created, try to create
84-
if h.Config.DatabaseAutoCreate && kivik.StatusCode(err) == http.StatusNotFound {
92+
if h.Config.DatabaseAutoCreate && kivik.HTTPStatus(err) == http.StatusNotFound {
8593
err := h.Client.CreateDB(ctx, h.Name)
8694
if err != nil {
8795
h.state.SetErrorState(fmt.Errorf("failed to put object: %v", err))
@@ -90,7 +98,7 @@ put:
9098
goto put
9199
}
92100

93-
if kivik.StatusCode(err) == http.StatusConflict {
101+
if kivik.HTTPStatus(err) == http.StatusConflict {
94102
goto check
95103
}
96104
h.state.SetErrorState(fmt.Errorf("failed to put object: %v", err))

‎backend/k8sapi/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"os"
1515
"strings"
1616

17-
"github.com/caarlos0/env/v10"
17+
"github.com/caarlos0/env/v11"
1818
"github.com/pace/bricks/http/transport"
1919
"github.com/pace/bricks/maintenance/log"
2020
)

‎backend/objstore/objstore.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77
"time"
88

9-
"github.com/caarlos0/env/v10"
9+
"github.com/caarlos0/env/v11"
1010
"github.com/minio/minio-go/v7"
1111
"github.com/minio/minio-go/v7/pkg/credentials"
1212

‎backend/postgres/postgres.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"strconv"
1212
"time"
1313

14-
"github.com/caarlos0/env/v10"
15-
"github.com/pace/bricks/backend/postgres/hooks"
14+
"github.com/caarlos0/env/v11"
1615
"github.com/pace/bricks/maintenance/health/servicehealthcheck"
1716
"github.com/prometheus/client_golang/prometheus"
1817
"github.com/uptrace/bun"
1918
"github.com/uptrace/bun/dialect/pgdialect"
2019
"github.com/uptrace/bun/driver/pgdriver"
2120

21+
"github.com/pace/bricks/backend/postgres/hooks"
2222
"github.com/pace/bricks/maintenance/log"
2323
)
2424

‎backend/queue/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"log"
55
"time"
66

7-
"github.com/caarlos0/env/v10"
7+
"github.com/caarlos0/env/v11"
88
)
99

1010
type config struct {

‎backend/redis/redis.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"time"
99

10-
"github.com/caarlos0/env/v10"
10+
"github.com/caarlos0/env/v11"
1111
"github.com/getsentry/sentry-go"
1212
"github.com/prometheus/client_golang/prometheus"
1313
"github.com/redis/go-redis/v9"

‎grpc/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/rs/zerolog"
2424
zlog "github.com/rs/zerolog/log"
2525

26-
"github.com/caarlos0/env/v10"
26+
"github.com/caarlos0/env/v11"
2727
"google.golang.org/grpc"
2828
"google.golang.org/grpc/metadata"
2929
"google.golang.org/grpc/peer"

‎http/jsonapi/generator/generate.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/getkin/kin-openapi/openapi3"
1515
)
1616

17-
type buildFunc func(schema *openapi3.Swagger) error
17+
type buildFunc func(schema *openapi3.T) error
1818

1919
// Generator for go types, requests handler and simple validators
2020
// for the given OpenAPIv3. The OpenAPIv3 schema is expected to comply
@@ -29,8 +29,8 @@ type Generator struct {
2929
generatedArrayTypes map[string]bool
3030
}
3131

32-
func loadSwaggerFromURI(loader *openapi3.SwaggerLoader, url *url.URL) (*openapi3.Swagger, error) { // nolint: interfacer
33-
var schema *openapi3.Swagger
32+
func loadSwaggerFromURI(loader *openapi3.Loader, url *url.URL) (*openapi3.T, error) { // nolint: interfacer
33+
var schema *openapi3.T
3434

3535
resp, err := http.Get(url.String())
3636
if err != nil {
@@ -43,7 +43,7 @@ func loadSwaggerFromURI(loader *openapi3.SwaggerLoader, url *url.URL) (*openapi3
4343
return nil, err
4444
}
4545

46-
schema, err = loader.LoadSwaggerFromData(body)
46+
schema, err = loader.LoadFromData(body)
4747
if err != nil {
4848
return nil, err
4949
}
@@ -54,8 +54,8 @@ func loadSwaggerFromURI(loader *openapi3.SwaggerLoader, url *url.URL) (*openapi3
5454
// BuildSource generates the go code in the specified path with specified package name
5555
// based on the passed schema source (url or file path)
5656
func (g *Generator) BuildSource(source, packagePath, packageName string) (string, error) {
57-
loader := openapi3.NewSwaggerLoader()
58-
var schema *openapi3.Swagger
57+
loader := openapi3.NewLoader()
58+
var schema *openapi3.T
5959

6060
if strings.HasPrefix(source, "http://") || strings.HasPrefix(source, "https://") {
6161
loc, err := url.Parse(source)
@@ -75,7 +75,7 @@ func (g *Generator) BuildSource(source, packagePath, packageName string) (string
7575
}
7676

7777
// parse spec
78-
schema, err = loader.LoadSwaggerFromData(data)
78+
schema, err = loader.LoadFromData(data)
7979
if err != nil {
8080
return "", err
8181
}
@@ -86,7 +86,7 @@ func (g *Generator) BuildSource(source, packagePath, packageName string) (string
8686

8787
// BuildSchema generates the go code in the specified path with specified package name
8888
// based on the passed schema
89-
func (g *Generator) BuildSchema(schema *openapi3.Swagger, packagePath, packageName string) (string, error) {
89+
func (g *Generator) BuildSchema(schema *openapi3.T, packagePath, packageName string) (string, error) {
9090
g.generatedTypes = make(map[string]bool)
9191
g.generatedArrayTypes = make(map[string]bool)
9292

0 commit comments

Comments
 (0)