3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-24 20:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

databroker: add support for field masks on Put (#3210)

Browse source 
* databroker: add support for field masks on Put

* return errors

* clean up go.mod
This commit is contained in:
Caleb Doxsey 2022-03-29 16:36:40 -06:00 • committed by GitHub
parent 8fc5dbf4c5
commit 2dc778035d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 381 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

65
pkg/storage/redis/redis_test.go
View file

@ -8,15 +8,18 @@ import (
"testing"
"time"
envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/fieldmaskpb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/pomerium/pomerium/internal/testutil"
"github.com/pomerium/pomerium/pkg/grpc/databroker"
"github.com/pomerium/pomerium/pkg/protoutil"
)
func TestBackend(t *testing.T) {
@ -48,7 +51,7 @@ func TestBackend(t *testing.T) {
Type: "TYPE",
Id: "abcd",
Data: data,
})
}, nil)
assert.NoError(t, err)
assert.Equal(t, serverVersion, sv)
record, err := backend.Get(ctx, "TYPE", "abcd")
@ -67,7 +70,7 @@ func TestBackend(t *testing.T) {
Type: "TYPE",
Id: "abcd",
DeletedAt: timestamppb.Now(),
})
}, nil)
assert.NoError(t, err)
assert.Equal(t, serverVersion, sv)
record, err := backend.Get(ctx, "TYPE", "abcd")
@ -79,7 +82,7 @@ func TestBackend(t *testing.T) {
sv, err := backend.Put(ctx, &databroker.Record{
Type: "TYPE",
Id: fmt.Sprint(i),
})
}, nil)
assert.NoError(t, err)
assert.Equal(t, serverVersion, sv)
}
@ -163,7 +166,7 @@ func TestChangeSignal(t *testing.T) {
_, err = backend.Put(ctx, &databroker.Record{
Type: "TYPE",
Id: "ID",
})
}, nil)
if err != nil {
return err
}
@ -200,7 +203,7 @@ func TestExpiry(t *testing.T) {
_, err := backend.Put(ctx, &databroker.Record{
Type: "TYPE",
Id: fmt.Sprint(i),
})
}, nil)
assert.NoError(t, err)
}
stream, err := backend.Sync(ctx, serverVersion, 0)
@ -247,7 +250,7 @@ func TestCapacity(t *testing.T) {
_, err = backend.Put(ctx, &databroker.Record{
Type: "EXAMPLE",
Id: fmt.Sprint(i),
})
}, nil)
require.NoError(t, err)
}
@ -300,3 +303,53 @@ func TestLease(t *testing.T) {
return nil
}))
}
func TestFieldMask(t *testing.T) {
if os.Getenv("GITHUB_ACTION") != "" && runtime.GOOS == "darwin" {
t.Skip("Github action can not run docker on MacOS")
}
ctx := context.Background()
require.NoError(t, testutil.WithTestRedis(false, func(rawURL string) error {
backend, err := New(rawURL)
require.NoError(t, err)
defer func() { _ = backend.Close() }()
_, _ = backend.Put(ctx, &databroker.Record{
Type: "example",
Id: "example",
Data: protoutil.NewAny(&envoy_type_v3.SemanticVersion{
MajorNumber: 1,
MinorNumber: 1,
Patch: 1,
}),
}, nil)
_, _ = backend.Put(ctx, &databroker.Record{
Type: "example",
Id: "example",
Data: protoutil.NewAny(&envoy_type_v3.SemanticVersion{
MajorNumber: 2,
MinorNumber: 2,
Patch: 2,
}),
}, &fieldmaskpb.FieldMask{
Paths: []string{"major_number", "patch"},
})
record, _ := backend.Get(ctx, "example", "example")
record.ModifiedAt = nil
testutil.AssertProtoJSONEqual(t, `{
"data": {
"@type": "type.googleapis.com/envoy.type.v3.SemanticVersion",
"majorNumber": 2,
"minorNumber": 1,
"patch": 2
},
"id": "example",
"type": "example",
"version": "2"
}`, record)
return nil
}))
}