Skip to content

Commit

Permalink
all: bump flake/go versions and regenerate
Browse files Browse the repository at this point in the history
Change-Id: I9a084aec7eff9fef365775b2511fcc77a427be14
  • Loading branch information
zeebo committed Nov 22, 2022
1 parent 8ad4620 commit 2851baa
Show file tree
Hide file tree
Showing 19 changed files with 59 additions and 62 deletions.
5 changes: 1 addition & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ run:
linters:
enable:
- bodyclose # find unclosed http response bodies
- deadcode # find code that is not used
- dogsled # checks for too many ignored arguments
- durationcheck # verifies whether durations are multiplied, usually a mistake
- errcheck # find unchecked errors
Expand All @@ -33,9 +32,7 @@ linters:
- nolintlint # checks that nolint directives are correct
- revive # check standard linting rules
- staticcheck # comprehensive checks
- structcheck # check for unused struct parameters
- unconvert # remove unnecessary conversions
- varcheck # find unused global variables and constants
- wastedassign
#TODO#- forcetypeassert # needs work to replace unchecked interface type assertion
#TODO#- gochecknoglobals # needs work to remove globals
Expand Down Expand Up @@ -169,4 +166,4 @@ issues:
text: "do not define dynamic errors"
- linters:
- revive
text: "if-return"
text: "if-return"
2 changes: 1 addition & 1 deletion cmd/protoc-gen-go-drpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

`import "storj.io/drpc/cmd/protoc-gen-go-drpc"`


protoc-gen-go-drpc generates DRPC code for protobuf services.

## Usage
1 change: 1 addition & 0 deletions cmd/protoc-gen-go-drpc/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.

// protoc-gen-go-drpc generates DRPC code for protobuf services.
package main

import (
Expand Down
13 changes: 7 additions & 6 deletions drpcpool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Options contains the options to configure a pool.
#### type Pool

```go
type Pool[K comparable] struct {
type Pool struct {
}
```

Expand All @@ -62,22 +62,23 @@ connections either in total or per key.
#### func New

```go
func New[K comparable](opts Options) *Pool[K]
func New(opts Options) *Pool
```
New constructs a new Pool with the provided Options.

#### func (*Pool[K]) Close
#### func (*Pool) Close

```go
func (p *Pool[K]) Close() (err error)
func (p *Pool) Close() (err error)
```
Close evicts all entries from the Pool's cache, closing them and returning all
of the combined errors from closing.

#### func (*Pool[K]) Get
#### func (*Pool) Get

```go
func (p *Pool[K]) Get(ctx context.Context, key K, dial func(ctx context.Context, key K) (drpc.Conn, error)) drpc.Conn
func (p *Pool) Get(ctx context.Context, key interface{},
dial func(ctx context.Context, key interface{}) (drpc.Conn, error)) drpc.Conn
```
Get returns a new drpc.Conn that will use the provided dial function to create
an underlying conn to be cached by the Pool when Conn methods are invoked. It
Expand Down
2 changes: 1 addition & 1 deletion examples/drpc/pb/sesamestreet.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/drpc_and_http/pb/sesamestreet.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/grpc/pb/sesamestreet.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/grpc_and_drpc/pb/sesamestreet.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/opentelemetry/pb/sesamestreet.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]));
};
subPackages = [ "cmd/protoc-gen-go-drpc" ];
vendorSha256 = "sha256-3kIFjZDi2qnEDXDY0ozvylxJlBePkK7IPFOVipsfLBU=";
vendorSha256 = "sha256-NMa9c+QIq9VEUQZqZ5X9fNbZDJT99q8XNCH2rRKyMzQ=";
};

devShell =
Expand All @@ -31,24 +31,24 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = "v0.2.0";
sha256 = "sha256-QhTjzrERhbhCSkPzyLQwFyxrktNoGL9ris+XfE7n5nQ=";
rev = "2022.1.3";
sha256 = "sha256-Yli+8gMoRRyNqOgFRv/uyFBVXdIlDH0tfZzvfTYBPyU=";
};
doCheck = false;
subPackages = [ "cmd/staticcheck" ];
vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY=";
vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8=";
};

ci = buildGoModule {
name = "ci";
src = fetchFromGitHub {
owner = "storj";
repo = "ci";
rev = "63f7574acdb97dd567c64537228d8582980ec301";
sha256 = "sha256-AkrUZbS88BLc3dtWxYkecUNa29slwQ7/feT9+lPWO9g=";
rev = "37130d944fc8b60928fd460fe53ebaa7204c8102";
sha256 = "sha256-NcsLA5d5sF1qSPSu/Pw/Md+0nr+inXAsPx9bKWh3I7Y=";
};
doCheck = false;
vendorSha256 = "sha256-6D452YbnkunAfD/M69VmwGDxENmVS72NKj92FTemJR0=";
vendorSha256 = "sha256-G5cAb9zFqjdCLIodGcPv9u4ABZZKEGTx0CvB4i7JdRg=";
allowGoReference = true; # until check-imports stops needing this
subPackages = [
"check-copyright"
Expand Down Expand Up @@ -103,8 +103,8 @@
src = fetchFromGitHub {
owner = "twitchtv";
repo = "twirp";
rev = "v8.1.0";
sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk=";
rev = "v8.1.3";
sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs=";
};
doCheck = false;
goPackagePath = "github.com/twitchtv/twirp";
Expand All @@ -116,11 +116,11 @@
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "v0.1.4";
sha256 = "sha256-7iQZvA6uUjZLP3/dxaM9y9jomSwEoaUgGclnciF8rh4=";
rev = "v0.3.0";
sha256 = "sha256-UMEhFxODGQ20vkZPtscBpHhUDa6/+hnD85Z1yx0pQfQ=";
};
doCheck = false;
vendorSha256 = "sha256-PRC59obp0ptooFuWhg2ruihEfJ0wKeMyT9xcLjoZyCo=";
vendorSha256 = "sha256-EQHYf4Q+XNjwG/KDoTA4m0mlBGxPkJSLUcO0VHFSpeA=";
subPackages = [ "cmd/stringer" ];
};

Expand All @@ -141,7 +141,7 @@
buildInputs = [
defaultPackage

go_1_17
go_1_19
golangci-lint
protobuf
graphviz
Expand Down
1 change: 1 addition & 0 deletions internal/backcompat/newservice/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (C) 2021 Storj Labs, Inc.
// See LICENSE for copying information.

// newservice runs the new version of the backwards compatibility check.
package main

import (
Expand Down
2 changes: 1 addition & 1 deletion internal/backcompat/newservicedefs/servicedefs.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/backcompat/oldservice/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (C) 2021 Storj Labs, Inc.
// See LICENSE for copying information.

// oldservice runs the old version of the backwards compatibility check.
package main

import (
Expand Down
2 changes: 1 addition & 1 deletion internal/grpccompat/service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/integration/customservice/service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/integration/service/service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/twirpcompat/clientcompat.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2851baa

Please sign in to comment.