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

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>

v2/acl/json.go

@@ -102,3 +102,23 @@ func (f *HeaderFilter) UnmarshalJSON(data []byte) error {
 
 	return nil
 }
+
+func (t *Target) MarshalJSON() ([]byte, error) {
+	return protojson.MarshalOptions{
+		EmitUnpopulated: true,
+	}.Marshal(
+		TargetToGRPCMessage(t),
+	)
+}
+
+func (t *Target) UnmarshalJSON(data []byte) error {
+	msg := new(acl.EACLRecord_Target)
+
+	if err := protojson.Unmarshal(data, msg); err != nil {
+		return err
+	}
+
+	*t = *TargetInfoFromGRPCMessage(msg)
+
+	return nil
+}

v2/acl/json_test.go

@@ -76,3 +76,15 @@ func TestFilterJSON(t *testing.T) {
 
 	require.Equal(t, f, f2)
 }
+
+func TestTargetJSON(t *testing.T) {
+	tar := generateTarget(acl.RoleSystem, 3)
+
+	data, err := tar.MarshalJSON()
+	require.NoError(t, err)
+
+	tar2 := new(acl.Target)
+	require.NoError(t, tar2.UnmarshalJSON(data))
+
+	require.Equal(t, tar, tar2)
+}

v2/acl/marshal.go

@@ -278,6 +278,17 @@ func (t *Target) StableSize() (size int) {
 	return size
 }
 
+func (t *Target) Unmarshal(data []byte) error {
+	m := new(acl.EACLRecord_Target)
+	if err := proto.Unmarshal(data, m); err != nil {
+		return err
+	}
+
+	*t = *TargetInfoFromGRPCMessage(m)
+
+	return nil
+}
+
 func (l *TokenLifetime) StableMarshal(buf []byte) ([]byte, error) {
 	if l == nil {
 		return []byte{}, nil

v2/acl/marshal_test.go

@@ -136,7 +136,6 @@ func TestHeaderFilter_StableMarshal(t *testing.T) {
 
 func TestTargetInfo_StableMarshal(t *testing.T) {
 	targetFrom := generateTarget(acl.RoleUser, 2)
-	transport := new(grpc.EACLRecord_Target)
 
 	t.Run("non empty", func(t *testing.T) {
 		targetFrom.SetRole(acl.RoleUser)
@@ -148,10 +147,9 @@ func TestTargetInfo_StableMarshal(t *testing.T) {
 		wire, err := targetFrom.StableMarshal(nil)
 		require.NoError(t, err)
 
-		err = goproto.Unmarshal(wire, transport)
-		require.NoError(t, err)
+		targetTo := new(acl.Target)
+		require.NoError(t, targetTo.Unmarshal(wire))
 
-		targetTo := acl.TargetInfoFromGRPCMessage(transport)
 		require.Equal(t, targetFrom, targetTo)
 	})
 }