3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-24 06:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

upgrade to go v1.24 (#5562)

Browse source 
* upgrade to go v1.24

* add a macOS-specific //nolint comment too

---------

Co-authored-by: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com>
This commit is contained in:
Caleb Doxsey 2025-04-02 15:53:09 -06:00 • committed by GitHub
parent 8d9f1bb38e
commit c47055bece
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
89 changed files with 170 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/storage/postgres/postgres.go
View file

@ -458,12 +458,12 @@ func signalServiceChange(ctx context.Context, q querier) error {
return err
}
func jsonbFromAny(any *anypb.Any) ([]byte, error) {
if any == nil {
func jsonbFromAny(a *anypb.Any) ([]byte, error) {
if a == nil {
return nil, nil
}
return protojson.Marshal(any)
return protojson.Marshal(a)
}
func timestamppbFromTimestamptz(ts pgtype.Timestamptz) *timestamppb.Timestamp {

5
pkg/storage/postgres/tracing_test.go
View file

@ -8,6 +8,9 @@ import (
"runtime"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/pomerium/pomerium/config"
"github.com/pomerium/pomerium/internal/testenv"
"github.com/pomerium/pomerium/internal/testenv/scenarios"
@ -15,8 +18,6 @@ import (
"github.com/pomerium/pomerium/internal/testenv/upstreams"
"github.com/pomerium/pomerium/internal/testutil"
"github.com/pomerium/pomerium/internal/testutil/tracetest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestQueryTracing(t *testing.T) {