[#1124] cli: Improve APE rule parsing

* Make APE rule parser to read condition's kind in unambiguous using lexemes
`ResourceCondition`, `RequestCondition` instead confusing `Object.Request`, `Object.Resource`.
* Fix unit-tests.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
Airat Arifullin 2024-05-14 12:23:26 +03:00
parent 20baf6e112
commit 952d13cd2b
8 changed files with 151 additions and 147 deletions

View file

@ -312,10 +312,10 @@ func TestAPECheck(t *testing.T) {
Any: true,
Condition: []chain.Condition{
{
Op: chain.CondStringLike,
Object: chain.ObjectResource,
Key: "attr1",
Value: "attribute*",
Op: chain.CondStringLike,
Kind: chain.KindResource,
Key: "attr1",
Value: "attribute*",
},
},
},
@ -351,10 +351,10 @@ func TestAPECheck(t *testing.T) {
Any: true,
Condition: []chain.Condition{
{
Op: chain.CondStringLike,
Object: chain.ObjectRequest,
Key: nativeschema.PropertyKeyActorPublicKey,
Value: senderKey,
Op: chain.CondStringLike,
Kind: chain.KindRequest,
Key: nativeschema.PropertyKeyActorPublicKey,
Value: senderKey,
},
},
},
@ -381,10 +381,10 @@ func TestAPECheck(t *testing.T) {
Any: true,
Condition: []chain.Condition{
{
Op: chain.CondStringEquals,
Object: chain.ObjectResource,
Key: nativeschema.PropertyKeyObjectPayloadLength,
Value: "1000",
Op: chain.CondStringEquals,
Kind: chain.KindResource,
Key: nativeschema.PropertyKeyObjectPayloadLength,
Value: "1000",
},
},
},
@ -503,10 +503,10 @@ func TestPutECChunk(t *testing.T) {
Any: true,
Condition: []chain.Condition{
{
Op: chain.CondStringEquals,
Object: chain.ObjectResource,
Key: "attr1",
Value: "value",
Op: chain.CondStringEquals,
Kind: chain.KindResource,
Key: "attr1",
Value: "value",
},
},
},