mirror of
https://github.com/pomerium/pomerium.git
synced 2025-04-29 10:26:29 +02:00
* chore(deps): bump the go group with 21 updates Bumps the go group with 21 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) | `1.41.0` | `1.42.0` | | [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) | `1.27.0` | `1.30.1` | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.27.16` | `1.27.23` | | [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2) | `1.54.3` | `1.57.1` | | [github.com/caddyserver/certmagic](https://github.com/caddyserver/certmagic) | `0.21.2` | `0.21.3` | | [github.com/cloudflare/circl](https://github.com/cloudflare/circl) | `1.3.8` | `1.3.9` | | [github.com/docker/docker](https://github.com/docker/docker) | `26.1.3+incompatible` | `27.0.3+incompatible` | | [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) | `5.0.12` | `5.1.0` | | [github.com/gorilla/websocket](https://github.com/gorilla/websocket) | `1.5.1` | `1.5.3` | | [github.com/klauspost/compress](https://github.com/klauspost/compress) | `1.17.8` | `1.17.9` | | [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) | `7.0.70` | `7.0.72` | | [github.com/open-policy-agent/opa](https://github.com/open-policy-agent/opa) | `0.65.0` | `0.66.0` | | [github.com/prometheus/common](https://github.com/prometheus/common) | `0.53.0` | `0.55.0` | | [github.com/spf13/viper](https://github.com/spf13/viper) | `1.18.2` | `1.19.0` | | [golang.org/x/crypto](https://github.com/golang/crypto) | `0.23.0` | `0.24.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.25.0` | `0.26.0` | | [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.20.0` | `0.21.0` | | [golang.org/x/sys](https://github.com/golang/sys) | `0.20.0` | `0.21.0` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.178.0` | `0.183.0` | | [google.golang.org/genproto/googleapis/rpc](https://github.com/googleapis/go-genproto) | `0.0.0-20240515191416-fc5f0ca64291` | `0.0.0-20240528184218-531527333157` | | google.golang.org/protobuf | `1.34.1` | `1.34.2` | Updates `cloud.google.com/go/storage` from 1.41.0 to 1.42.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.41.0...spanner/v1.42.0) Updates `github.com/aws/aws-sdk-go-v2` from 1.27.0 to 1.30.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.27.0...v1.30.1) Updates `github.com/aws/aws-sdk-go-v2/config` from 1.27.16 to 1.27.23 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.27.16...config/v1.27.23) Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.54.3 to 1.57.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.54.3...service/s3/v1.57.1) Updates `github.com/caddyserver/certmagic` from 0.21.2 to 0.21.3 - [Release notes](https://github.com/caddyserver/certmagic/releases) - [Commits](https://github.com/caddyserver/certmagic/compare/v0.21.2...v0.21.3) Updates `github.com/cloudflare/circl` from 1.3.8 to 1.3.9 - [Release notes](https://github.com/cloudflare/circl/releases) - [Commits](https://github.com/cloudflare/circl/compare/v1.3.8...v1.3.9) Updates `github.com/docker/docker` from 26.1.3+incompatible to 27.0.3+incompatible - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v26.1.3...v27.0.3) Updates `github.com/go-chi/chi/v5` from 5.0.12 to 5.1.0 - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.0.12...v5.1.0) Updates `github.com/gorilla/websocket` from 1.5.1 to 1.5.3 - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](https://github.com/gorilla/websocket/compare/v1.5.1...v1.5.3) Updates `github.com/klauspost/compress` from 1.17.8 to 1.17.9 - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.8...v1.17.9) Updates `github.com/minio/minio-go/v7` from 7.0.70 to 7.0.72 - [Release notes](https://github.com/minio/minio-go/releases) - [Commits](https://github.com/minio/minio-go/compare/v7.0.70...v7.0.72) Updates `github.com/open-policy-agent/opa` from 0.65.0 to 0.66.0 - [Release notes](https://github.com/open-policy-agent/opa/releases) - [Changelog](https://github.com/open-policy-agent/opa/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-policy-agent/opa/compare/v0.65.0...v0.66.0) Updates `github.com/prometheus/common` from 0.53.0 to 0.55.0 - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](https://github.com/prometheus/common/compare/v0.53.0...v0.55.0) Updates `github.com/spf13/viper` from 1.18.2 to 1.19.0 - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.18.2...v1.19.0) Updates `golang.org/x/crypto` from 0.23.0 to 0.24.0 - [Commits](https://github.com/golang/crypto/compare/v0.23.0...v0.24.0) Updates `golang.org/x/net` from 0.25.0 to 0.26.0 - [Commits](https://github.com/golang/net/compare/v0.25.0...v0.26.0) Updates `golang.org/x/oauth2` from 0.20.0 to 0.21.0 - [Commits](https://github.com/golang/oauth2/compare/v0.20.0...v0.21.0) Updates `golang.org/x/sys` from 0.20.0 to 0.21.0 - [Commits](https://github.com/golang/sys/compare/v0.20.0...v0.21.0) Updates `google.golang.org/api` from 0.178.0 to 0.183.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.178.0...v0.183.0) Updates `google.golang.org/genproto/googleapis/rpc` from 0.0.0-20240515191416-fc5f0ca64291 to 0.0.0-20240528184218-531527333157 - [Commits](https://github.com/googleapis/go-genproto/commits) Updates `google.golang.org/protobuf` from 1.34.1 to 1.34.2 --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/caddyserver/certmagic dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/cloudflare/circl dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-major dependency-group: go - dependency-name: github.com/go-chi/chi/v5 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/minio/minio-go/v7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/open-policy-agent/opa dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: google.golang.org/genproto/googleapis/rpc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * fix test --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Caleb Doxsey <cdoxsey@pomerium.com>
143 lines
3.4 KiB
Go
143 lines
3.4 KiB
Go
package databroker
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/protobuf/proto"
|
|
"google.golang.org/protobuf/types/known/structpb"
|
|
|
|
"github.com/pomerium/pomerium/internal/testutil"
|
|
"github.com/pomerium/pomerium/pkg/protoutil"
|
|
)
|
|
|
|
func TestApplyOffsetAndLimit(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
records []*Record
|
|
offset, limit int
|
|
expect []*Record
|
|
}{
|
|
{
|
|
name: "empty",
|
|
records: nil,
|
|
offset: 10,
|
|
limit: 5,
|
|
expect: nil,
|
|
},
|
|
{
|
|
name: "less than limit",
|
|
records: []*Record{{Id: "A"}, {Id: "B"}, {Id: "C"}, {Id: "D"}},
|
|
offset: 1,
|
|
limit: 10,
|
|
expect: []*Record{{Id: "B"}, {Id: "C"}, {Id: "D"}},
|
|
},
|
|
{
|
|
name: "more than limit",
|
|
records: []*Record{{Id: "A"}, {Id: "B"}, {Id: "C"}, {Id: "D"}, {Id: "E"}, {Id: "F"}, {Id: "G"}, {Id: "H"}},
|
|
offset: 3,
|
|
limit: 2,
|
|
expect: []*Record{{Id: "D"}, {Id: "E"}},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
actual, cnt := ApplyOffsetAndLimit(tc.records, tc.offset, tc.limit)
|
|
assert.Equal(t, len(tc.records), cnt)
|
|
assert.Equal(t, tc.expect, actual)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestInitialSync(t *testing.T) {
|
|
ctx, clearTimeout := context.WithTimeout(context.Background(), time.Second*10)
|
|
defer clearTimeout()
|
|
|
|
li, err := net.Listen("tcp", "127.0.0.1:0")
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer li.Close()
|
|
|
|
r1 := new(Record)
|
|
r2 := new(Record)
|
|
|
|
m := &mockServer{
|
|
syncLatest: func(_ *SyncLatestRequest, stream DataBrokerService_SyncLatestServer) error {
|
|
stream.Send(&SyncLatestResponse{
|
|
Response: &SyncLatestResponse_Record{
|
|
Record: r1,
|
|
},
|
|
})
|
|
stream.Send(&SyncLatestResponse{
|
|
Response: &SyncLatestResponse_Record{
|
|
Record: r2,
|
|
},
|
|
})
|
|
stream.Send(&SyncLatestResponse{
|
|
Response: &SyncLatestResponse_Versions{
|
|
Versions: &Versions{
|
|
LatestRecordVersion: 2,
|
|
ServerVersion: 1,
|
|
},
|
|
},
|
|
})
|
|
return nil
|
|
},
|
|
}
|
|
|
|
srv := grpc.NewServer()
|
|
RegisterDataBrokerServiceServer(srv, m)
|
|
go srv.Serve(li)
|
|
|
|
cc, err := grpc.Dial(li.Addr().String(), grpc.WithInsecure())
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
defer cc.Close()
|
|
|
|
c := NewDataBrokerServiceClient(cc)
|
|
|
|
records, recordVersion, serverVersion, err := InitialSync(ctx, c, new(SyncLatestRequest))
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, uint64(2), recordVersion)
|
|
assert.Equal(t, uint64(1), serverVersion)
|
|
testutil.AssertProtoEqual(t, []*Record{r1, r2}, records)
|
|
}
|
|
|
|
func TestOptimumPutRequestsFromRecords(t *testing.T) {
|
|
var records []*Record
|
|
for i := 0; i < 10_000; i++ {
|
|
s := structpb.NewStructValue(&structpb.Struct{
|
|
Fields: map[string]*structpb.Value{
|
|
"long_string": structpb.NewStringValue(strings.Repeat("x", 987)),
|
|
},
|
|
})
|
|
records = append(records, &Record{
|
|
Id: fmt.Sprintf("%d", i),
|
|
Data: protoutil.NewAny(s),
|
|
})
|
|
}
|
|
requests := OptimumPutRequestsFromRecords(records)
|
|
for _, request := range requests {
|
|
assert.LessOrEqual(t, proto.Size(request), maxMessageSize)
|
|
assert.GreaterOrEqual(t, proto.Size(request), maxMessageSize/2)
|
|
}
|
|
}
|
|
|
|
type mockServer struct {
|
|
DataBrokerServiceServer
|
|
|
|
syncLatest func(empty *SyncLatestRequest, server DataBrokerService_SyncLatestServer) error
|
|
}
|
|
|
|
func (m *mockServer) SyncLatest(req *SyncLatestRequest, stream DataBrokerService_SyncLatestServer) error {
|
|
return m.syncLatest(req, stream)
|
|
}
|