Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: "1.24"
- run: make format
- name: Indicate formatting issues
run: git diff HEAD --exit-code --color
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "^1.19.0"
- run: make tools
- run:
.bin/go-acc -o coverage.out ./... -- -v -failfast -timeout=20m -tags
sqlite
- run: .bin/gcov2lcov -infile=coverage.out -outfile=coverage.lcov
go-version: "1.24"
- run: go test -coverprofile=coverage.out -timeout=1m ./...
- run: go tool gcov2lcov -infile=coverage.out -outfile=coverage.lcov
- name: Coveralls
uses: coverallsapp/github-action@master
with:
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
format: .bin/ory tools node_modules
format: .bin/ory node_modules
.bin/ory dev headers copyright --type=open-source --exclude=httputil
.bin/goimports -w -local github.com/ory *.go . httputil
go tool goimports -w -local github.com/ory *.go . httputil
npm exec -- prettier --write .

licenses: .bin/licenses node_modules # checks open-source licenses
Expand All @@ -16,6 +16,3 @@ licenses: .bin/licenses node_modules # checks open-source licenses
node_modules: package-lock.json
npm ci
touch node_modules

tools:
GOBIN=$(shell pwd)/.bin/ go install github.com/ory/go-acc golang.org/x/tools/cmd/goimports github.com/jandelgado/gcov2lcov
7 changes: 3 additions & 4 deletions error_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ import (
"io"
"net/http"

"github.com/pkg/errors"
"google.golang.org/genproto/googleapis/rpc/errdetails"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"google.golang.org/protobuf/protoadapt"
)

// swagger:ignore
Expand Down Expand Up @@ -171,7 +170,7 @@ func (e DefaultError) GRPCStatus() *status.Status {
}
}

details := []proto.Message{}
details := []protoadapt.MessageV1{}

if e.DebugField != "" || st != nil {
details = append(details, &errdetails.DebugInfo{
Expand Down
54 changes: 21 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@
module github.com/ory/herodot

go 1.19
go 1.24

require (
github.com/golang/protobuf v1.5.3
github.com/google/go-cmp v0.5.9
github.com/jandelgado/gcov2lcov v1.0.5
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.1
golang.org/x/sync v0.1.0
golang.org/x/tools v0.7.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.3
google.golang.org/grpc/examples v0.0.0-20210304020650-930c79186c99
github.com/stretchr/testify v1.10.0
golang.org/x/sync v0.12.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4
google.golang.org/grpc v1.71.0
google.golang.org/grpc/examples v0.0.0-20250318070318-1703656ba59e
google.golang.org/protobuf v1.36.5
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/jandelgado/gcov2lcov v1.1.1 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.14.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/tools v0.31.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

tool (
github.com/jandelgado/gcov2lcov
golang.org/x/tools/cmd/goimports
)
Loading