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

storage: ignore removed fields when deserializing the data (#3768)

Browse source 
ignore removed fields when deserializing the data
This commit is contained in:
Denis Mishin 2022-11-28 11:31:57 -05:00 • committed by GitHub
parent 424bdb4e62
commit 1d252f43ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import (
"github.com/pomerium/pomerium/pkg/grpc/databroker"
"github.com/pomerium/pomerium/pkg/grpc/registry"
"github.com/pomerium/pomerium/pkg/protoutil"
"github.com/pomerium/pomerium/pkg/storage"
)
@ -124,8 +125,7 @@ func getNextChangedRecord(ctx context.Context, q querier, recordType string, aft
}
afterRecordVersion = version
var any anypb.Any
err = protojson.Unmarshal(data.Bytes, &any)
any, err := protoutil.UnmarshalAnyJSON(data.Bytes)
if isUnknownType(err) {
// ignore
continue
@ -137,7 +137,7 @@ func getNextChangedRecord(ctx context.Context, q querier, recordType string, aft
Version: version,
Type: recordType,
Id: recordID,
Data: &any,
Data: any,
ModifiedAt: timestamppbFromTimestamptz(modifiedAt),
DeletedAt: timestamppbFromTimestamptz(deletedAt),
}, nil
@ -176,8 +176,7 @@ func getRecord(ctx context.Context, q querier, recordType, recordID string) (*da
return nil, fmt.Errorf("postgres: failed to execute query: %w", err)
}
var any anypb.Any
err = protojson.Unmarshal(data.Bytes, &any)
any, err := protoutil.UnmarshalAnyJSON(data.Bytes)
if isUnknownType(err) {
return nil, storage.ErrNotFound
} else if err != nil {
@ -188,7 +187,7 @@ func getRecord(ctx context.Context, q querier, recordType, recordID string) (*da
Version: version,
Type: recordType,
Id: recordID,
Data: &any,
Data: any,
ModifiedAt: timestamppbFromTimestamptz(modifiedAt),
}, nil
}
@ -228,8 +227,7 @@ func listRecords(ctx context.Context, q querier, expr storage.FilterExpression,
return nil, fmt.Errorf("postgres: failed to scan row: %w", err)
}
var any anypb.Any
err = protojson.Unmarshal(data.Bytes, &any)
any, err := protoutil.UnmarshalAnyJSON(data.Bytes)
if isUnknownType(err) {
// ignore records with an unknown type
continue
@ -241,7 +239,7 @@ func listRecords(ctx context.Context, q querier, expr storage.FilterExpression,
Version: version,
Type: recordType,
Id: id,
Data: &any,
Data: any,
ModifiedAt: timestamppbFromTimestamptz(modifiedAt),
})
}