[#168] acl: Implement binary/JSON encoders/decoders on TokenLifetime

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-13 15:00:03 +03:00 committed by Alex Vanin
parent 233756ca8f
commit 0f4d5d5f1e
4 changed files with 45 additions and 4 deletions

View file

@ -114,3 +114,23 @@ func (t *Table) UnmarshalJSON(data []byte) error {
return nil return nil
} }
func (l *TokenLifetime) MarshalJSON() ([]byte, error) {
return protojson.MarshalOptions{
EmitUnpopulated: true,
}.Marshal(
TokenLifetimeToGRPCMessage(l),
)
}
func (l *TokenLifetime) UnmarshalJSON(data []byte) error {
msg := new(acl.BearerToken_Body_TokenLifetime)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
*l = *TokenLifetimeFromGRPCMessage(msg)
return nil
}

View file

@ -57,3 +57,15 @@ func TestTable_MarshalJSON(t *testing.T) {
require.Equal(t, tab, tab2) require.Equal(t, tab, tab2)
} }
func TestTokenLifetimeJSON(t *testing.T) {
l := generateLifetime(1, 2, 3)
data, err := l.MarshalJSON()
require.NoError(t, err)
l2 := new(acl.TokenLifetime)
require.NoError(t, l2.UnmarshalJSON(data))
require.Equal(t, l, l2)
}

View file

@ -359,6 +359,17 @@ func (l *TokenLifetime) StableSize() (size int) {
return size return size
} }
func (l *TokenLifetime) Unmarshal(data []byte) error {
m := new(acl.BearerToken_Body_TokenLifetime)
if err := proto.Unmarshal(data, m); err != nil {
return err
}
*l = *TokenLifetimeFromGRPCMessage(m)
return nil
}
func (bt *BearerTokenBody) StableMarshal(buf []byte) ([]byte, error) { func (bt *BearerTokenBody) StableMarshal(buf []byte) ([]byte, error) {
if bt == nil { if bt == nil {
return []byte{}, nil return []byte{}, nil

View file

@ -198,16 +198,14 @@ func TestTable_StableMarshal(t *testing.T) {
func TestTokenLifetime_StableMarshal(t *testing.T) { func TestTokenLifetime_StableMarshal(t *testing.T) {
lifetimeFrom := generateLifetime(10, 20, 30) lifetimeFrom := generateLifetime(10, 20, 30)
transport := new(grpc.BearerToken_Body_TokenLifetime)
t.Run("non empty", func(t *testing.T) { t.Run("non empty", func(t *testing.T) {
wire, err := lifetimeFrom.StableMarshal(nil) wire, err := lifetimeFrom.StableMarshal(nil)
require.NoError(t, err) require.NoError(t, err)
err = goproto.Unmarshal(wire, transport) lifetimeTo := new(acl.TokenLifetime)
require.NoError(t, err) require.NoError(t, lifetimeTo.Unmarshal(wire))
lifetimeTo := acl.TokenLifetimeFromGRPCMessage(transport)
require.Equal(t, lifetimeFrom, lifetimeTo) require.Equal(t, lifetimeFrom, lifetimeTo)
}) })
} }