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

databroker: use contextual logging for errors, use original record type for encryption (#3096)

Browse source
This commit is contained in:
Caleb Doxsey 2022-03-04 12:40:15 -07:00 • committed by GitHub
parent 8567b56b8d
commit aaff52fc61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/log/log.go
View file

@ -114,6 +114,13 @@ func Warn(ctx context.Context) *zerolog.Event {
return contextLogger(ctx).Warn() return contextLogger(ctx).Warn()
} }
// Error starts a new message with error level.
//
// You must call Msg on the returned event in order to send the event.
func Error(ctx context.Context) *zerolog.Event {
return contextLogger(ctx).Error()
}
func contextLogger(ctx context.Context) *zerolog.Logger { func contextLogger(ctx context.Context) *zerolog.Logger {
global := Logger() global := Logger()
if global.GetLevel() == zerolog.Disabled { if global.GetLevel() == zerolog.Disabled {
@ -133,13 +140,6 @@ func WithContext(ctx context.Context, update func(c zerolog.Context) zerolog.Con
return l.WithContext(ctx) return l.WithContext(ctx)
} }
// Error starts a new message with error level.
//
// You must call Msg on the returned event in order to send the event.
func Error(ctx context.Context) *zerolog.Event {
return Logger().Error()
}
// Fatal starts a new message with fatal level. The os.Exit(1) function // Fatal starts a new message with fatal level. The os.Exit(1) function
// is called by the Msg method. // is called by the Msg method.
// //

2
pkg/storage/encrypted.go
View file

@ -146,7 +146,7 @@ func (e *encryptedBackend) decryptRecord(in *databroker.Record) (out *databroker
// Create a new record so that we don't re-use any internal state // Create a new record so that we don't re-use any internal state
return &databroker.Record{ return &databroker.Record{
Version: in.Version, Version: in.Version,
Type: data.TypeUrl, Type: in.Type,
Id: in.Id, Id: in.Id,
Data: data, Data: data,
ModifiedAt: in.ModifiedAt, ModifiedAt: in.ModifiedAt,

4
pkg/storage/encrypted_test.go
View file

@ -81,7 +81,7 @@ func TestEncryptedBackend(t *testing.T) {
} }
assert.Equal(t, any.TypeUrl, record.Data.TypeUrl, "type should be preserved") assert.Equal(t, any.TypeUrl, record.Data.TypeUrl, "type should be preserved")
assert.Equal(t, any.Value, record.Data.Value, "value should be preserved") assert.Equal(t, any.Value, record.Data.Value, "value should be preserved")
assert.Equal(t, any.TypeUrl, record.Type, "record type should be preserved") assert.NotEqual(t, any.TypeUrl, record.Type, "record type should be preserved")
records, _, err := e.GetAll(ctx) records, _, err := e.GetAll(ctx)
if !assert.NoError(t, err) { if !assert.NoError(t, err) {
@ -90,6 +90,6 @@ func TestEncryptedBackend(t *testing.T) {
if assert.Len(t, records, 1) { if assert.Len(t, records, 1) {
assert.Equal(t, any.TypeUrl, records[0].Data.TypeUrl, "type should be preserved") assert.Equal(t, any.TypeUrl, records[0].Data.TypeUrl, "type should be preserved")
assert.Equal(t, any.Value, records[0].Data.Value, "value should be preserved") assert.Equal(t, any.Value, records[0].Data.Value, "value should be preserved")
assert.Equal(t, any.TypeUrl, records[0].Type, "record type should be preserved") assert.NotEqual(t, any.TypeUrl, records[0].Type, "record type should be preserved")
} }
} }