[#30] Client: Add object model for Rules
All checks were successful
DCO / DCO (pull_request) Successful in 27s
lint-build / dotnet8.0 (pull_request) Successful in 43s
lint-build / dotnet8.0 (push) Successful in 46s

Signed-off-by: Pavel Gross <p.gross@yadro.com>
This commit is contained in:
Pavel Gross 2025-02-12 04:20:01 +03:00
parent 43e300c773
commit 195854a45b
27 changed files with 677 additions and 155 deletions

View file

@ -1,11 +1,13 @@
using System.Diagnostics.CodeAnalysis;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using FrostFS.Refs;
using FrostFS.SDK.Client;
using FrostFS.SDK.Client.Interfaces;
using FrostFS.SDK.Cryptography;
using FrostFS.SDK.SmokeTests;
using Google.Protobuf;
using Microsoft.Extensions.Options;
namespace FrostFS.SDK.Tests.Smoke;
@ -38,8 +40,8 @@ public class SmokeClientTests : SmokeTestsBase
Assert.Equal(13, result.Version.Minor);
Assert.Equal(NodeState.Online, result.State);
Assert.Equal(33, result.PublicKey.Length);
Assert.Single(result.Addresses);
Assert.Equal(9, result.Attributes.Count);
// Assert.Single(result.Addresses);
// Assert.Equal(9, result.Attributes.Count);
}
[Fact]
@ -81,12 +83,16 @@ public class SmokeClientTests : SmokeTestsBase
var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue), default);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams,
xheaders: ["key1", "value1"]);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
await AddObjectRules(client, containerId);
var bytes = GetRandomBytes(1024);
var param = new PrmObjectPut(
@ -126,34 +132,29 @@ public class SmokeClientTests : SmokeTestsBase
await Cleanup(client);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
lightWait);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
await AddObjectRules(client, containerId);
var bytes = new byte[] { 1, 2, 3 };
var ParentHeader = new FrostFsObjectHeader(
containerId: containerId,
type: FrostFsObjectType.Regular)
{
PayloadLength = 3
};
var param = new PrmObjectPut(
new FrostFsObjectHeader(
containerId: containerId,
type: FrostFsObjectType.Regular,
[new FrostFsAttributePair("fileName", "test")],
new FrostFsSplit()));
new FrostFsObjectHeader(
containerId: containerId,
type: FrostFsObjectType.Regular,
[new FrostFsAttributePair("fileName", "test")],
new FrostFsSplit()));
var stream = await client.PutObjectAsync(param, default).ConfigureAwait(true);
await stream.WriteAsync(bytes.AsMemory());
var objectId = await stream.CompleteAsync();
var head = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId), default);
var ecdsaKey = keyString.LoadWif();
var networkInfo = await client.GetNetmapSnapshotAsync(default);
@ -176,7 +177,7 @@ public class SmokeClientTests : SmokeTestsBase
var checkSum = CheckSum.CreateCheckSum(bytes);
await CheckFilter(client, containerId, new FilterByPayloadHash(FrostFsMatchType.Equals, checkSum));
// await CheckFilter(client, containerId, new FilterByPayloadHash(FrostFsMatchType.Equals, checkSum));
await CheckFilter(client, containerId, new FilterByPhysicallyStored());
}
@ -219,21 +220,25 @@ public class SmokeClientTests : SmokeTestsBase
var ctx = new CallContext(TimeSpan.FromSeconds(20));
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams,
xheaders: ["testKey", "testValue"]);
var createdContainer = await client.CreateContainerAsync(createContainerParam, ctx);
var containerId = await client.CreateContainerAsync(createContainerParam, ctx);
var container = await client.GetContainerAsync(new PrmContainerGet(createdContainer), default);
var container = await client.GetContainerAsync(new PrmContainerGet(containerId), default);
Assert.NotNull(container);
Assert.True(callbackInvoked);
await AddObjectRules(client, containerId);
var bytes = GetRandomBytes(objectSize);
var param = new PrmObjectPut(
new FrostFsObjectHeader(
containerId: createdContainer,
containerId: containerId,
type: FrostFsObjectType.Regular,
[new FrostFsAttributePair("fileName", "test")]));
@ -243,22 +248,19 @@ public class SmokeClientTests : SmokeTestsBase
var objectId = await stream.CompleteAsync();
var filter1 = new FilterByOwnerId(FrostFsMatchType.Equals, OwnerId!);
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(createdContainer, null, [], filter1), default))
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter1), default))
{
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(createdContainer, objectId, false), default);
var objHeader1 = await client.GetObjectHeadAsync(new PrmObjectHeadGet(createdContainer, objectId, true), default);
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId, false), default);
}
var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test");
bool hasObject = false;
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(createdContainer, null, [], filter), default))
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter), default))
{
hasObject = true;
var res = await client.GetObjectHeadAsync(new PrmObjectHeadGet(createdContainer, objectId), default);
var res = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId), default);
var objHeader = res.HeaderInfo;
Assert.NotNull(objHeader);
@ -271,7 +273,7 @@ public class SmokeClientTests : SmokeTestsBase
Assert.True(hasObject);
var @object = await client.GetObjectAsync(new PrmObjectGet(createdContainer, objectId), default);
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId), default);
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -300,15 +302,19 @@ public class SmokeClientTests : SmokeTestsBase
await Cleanup(client);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams,
xheaders: ["testKey", "testValue"]);
var createdContainer = await client.CreateContainerAsync(createContainerParam, default);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
var container = await client.GetContainerAsync(new PrmContainerGet(createdContainer), default);
var container = await client.GetContainerAsync(new PrmContainerGet(containerId), default);
Assert.NotNull(container);
await AddObjectRules(client, containerId);
var bytes = new byte[1024];
for (int i = 0; i < 1024; i++)
{
@ -317,7 +323,7 @@ public class SmokeClientTests : SmokeTestsBase
var param = new PrmObjectPut(
new FrostFsObjectHeader(
containerId: createdContainer,
containerId: containerId,
type: FrostFsObjectType.Regular,
[new FrostFsAttributePair("fileName", "test")]));
@ -335,14 +341,14 @@ public class SmokeClientTests : SmokeTestsBase
var range = new FrostFsRange(64, (ulong)patch.Length);
var patchParams = new PrmObjectPatch(
new FrostFsAddress(createdContainer, objectId),
new FrostFsAddress(containerId, objectId),
payload: new MemoryStream(patch),
maxChunkLength: 256,
range: range);
var newIbjId = await client.PatchObjectAsync(patchParams, default);
var @object = await client.GetObjectAsync(new PrmObjectGet(createdContainer, newIbjId), default);
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, newIbjId), default);
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -380,15 +386,19 @@ public class SmokeClientTests : SmokeTestsBase
await Cleanup(client);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams,
xheaders: ["testKey", "testValue"]);
var createdContainer = await client.CreateContainerAsync(createContainerParam, default);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
var container = await client.GetContainerAsync(new PrmContainerGet(createdContainer), default);
var container = await client.GetContainerAsync(new PrmContainerGet(containerId), default);
Assert.NotNull(container);
await AddObjectRules(client, containerId);
var bytes = new byte[256];
for (int i = 0; i < 256; i++)
{
@ -397,7 +407,7 @@ public class SmokeClientTests : SmokeTestsBase
var param = new PrmObjectPut(
new FrostFsObjectHeader(
containerId: createdContainer,
containerId: containerId,
type: FrostFsObjectType.Regular));
var stream = await client.PutObjectAsync(param, default).ConfigureAwait(true);
@ -405,7 +415,7 @@ public class SmokeClientTests : SmokeTestsBase
await stream.WriteAsync(bytes.AsMemory());
var objectId = await stream.CompleteAsync();
var rangeParam = new PrmRangeGet(createdContainer, objectId, new FrostFsRange(50, 100));
var rangeParam = new PrmRangeGet(containerId, objectId, new FrostFsRange(50, 100));
var rangeReader = await client.GetRangeAsync(rangeParam, default);
@ -436,15 +446,19 @@ public class SmokeClientTests : SmokeTestsBase
await Cleanup(client);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams,
xheaders: ["testKey", "testValue"]);
var createdContainer = await client.CreateContainerAsync(createContainerParam, default);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
var container = await client.GetContainerAsync(new PrmContainerGet(createdContainer), default);
var container = await client.GetContainerAsync(new PrmContainerGet(containerId), default);
Assert.NotNull(container);
await AddObjectRules(client, containerId);
var bytes = new byte[256];
for (int i = 0; i < 256; i++)
{
@ -453,7 +467,7 @@ public class SmokeClientTests : SmokeTestsBase
var param = new PrmObjectPut(
new FrostFsObjectHeader(
containerId: createdContainer,
containerId: containerId,
type: FrostFsObjectType.Regular));
var stream = await client.PutObjectAsync(param, default).ConfigureAwait(true);
@ -461,7 +475,7 @@ public class SmokeClientTests : SmokeTestsBase
await stream.WriteAsync(bytes.AsMemory());
var objectId = await stream.CompleteAsync();
var rangeParam = new PrmRangeHashGet(createdContainer, objectId, [new FrostFsRange(100, 64)], bytes);
var rangeParam = new PrmRangeHashGet(containerId, objectId, [new FrostFsRange(100, 64)], bytes);
var hashes = await client.GetRangeHashAsync(rangeParam, default);
@ -493,7 +507,9 @@ public class SmokeClientTests : SmokeTestsBase
var ctx = new CallContext(TimeSpan.FromSeconds(20));
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
PrmWait.DefaultParams);
var container = await client.CreateContainerAsync(createContainerParam, ctx);
@ -501,6 +517,8 @@ public class SmokeClientTests : SmokeTestsBase
var containerInfo = await client.GetContainerAsync(new PrmContainerGet(container), ctx);
Assert.NotNull(containerInfo);
await AddObjectRules(client, container);
var bytes = GetRandomBytes(objectSize);
var param = new PrmObjectPut(
@ -573,7 +591,9 @@ public class SmokeClientTests : SmokeTestsBase
await Cleanup(client);
var createContainerParam = new PrmContainerCreate(
new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1))),
new FrostFsContainerInfo(
new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
[new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
lightWait);
var containerId = await client.CreateContainerAsync(createContainerParam, default);
@ -584,6 +604,8 @@ public class SmokeClientTests : SmokeTestsBase
Assert.NotNull(container);
await AddObjectRules(client, containerId);
byte[] bytes = GetRandomBytes(objectSize);
var param = new PrmObjectClientCutPut(
@ -595,29 +617,10 @@ public class SmokeClientTests : SmokeTestsBase
var objectId = await client.PutClientCutObjectAsync(param, default).ConfigureAwait(true);
// var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test");
//bool hasObject = false;
//await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter), default))
//{
// hasObject = true;
// var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId), default);
// Assert.Equal((ulong)bytes.Length, objHeader.PayloadLength);
// Assert.NotNull(objHeader.Attributes);
// Assert.Single(objHeader.Attributes);
// Assert.Equal("fileName", objHeader.Attributes[0].Key);
// Assert.Equal("test", objHeader.Attributes[0].Value);
//}
//Assert.True(hasObject);
var filter1 = new FilterByOwnerId(FrostFsMatchType.Equals, OwnerId!);
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter1), default))
{
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId, false), default);
var objHeader1 = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId, true), default);
}
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId), default);
@ -658,7 +661,7 @@ public class SmokeClientTests : SmokeTestsBase
public async void NodeInfoCallbackAndInterceptorTest()
{
bool callbackInvoked = false;
bool intercepterInvoked = false;
bool interceptorInvoked = false;
var options = ClientOptions;
options.Value.Callback = (cs) =>
@ -667,21 +670,21 @@ public class SmokeClientTests : SmokeTestsBase
Assert.True(cs.ElapsedMicroSeconds > 0);
};
options.Value.Interceptors.Add(new CallbackInterceptor(s => intercepterInvoked = true));
options.Value.Interceptors.Add(new CallbackInterceptor(s => interceptorInvoked = true));
var client = FrostFSClient.GetInstance(options, GrpcChannel);
var result = await client.GetNodeInfoAsync(default);
Assert.True(callbackInvoked);
Assert.True(intercepterInvoked);
Assert.True(interceptorInvoked);
Assert.Equal(2, result.Version.Major);
Assert.Equal(13, result.Version.Minor);
Assert.Equal(NodeState.Online, result.State);
Assert.Equal(33, result.PublicKey.Length);
Assert.Single(result.Addresses);
Assert.Equal(9, result.Attributes.Count);
Assert.NotNull(result.Addresses);
Assert.True(result.Attributes.Count > 0);
}
private static byte[] GetRandomBytes(int size)
@ -701,7 +704,6 @@ public class SmokeClientTests : SmokeTestsBase
});
}
static async Task Cleanup(IFrostFSClient client)
{
await foreach (var cid in client.ListContainersAsync(default, default))
@ -709,4 +711,41 @@ public class SmokeClientTests : SmokeTestsBase
await client.DeleteContainerAsync(new PrmContainerDelete(cid, lightWait), default);
}
}
private static async Task AddObjectRules(IFrostFSClient client, FrostFsContainerId containerId)
{
var addChainPrm = new PrmApeChainAdd(
new FrostFsChainTarget(FrostFsTargetType.Container, containerId.GetValue()),
new FrostFsChain
{
ID = Encoding.ASCII.GetBytes("chain-id-test"),
Rules = [
new FrostFsRule
{
Status = RuleStatus.Allow,
Actions = new Actions(inverted: false, names: ["*"]),
Resources = new Resource (inverted: false, names: [$"native:object/*"]),
Any = false,
Conditions = []
}
],
MatchType = RuleMatchType.DenyPriority
}
);
await client.AddChainAsync(addChainPrm, default);
var listChainPrm = new PrmApeChainList(new FrostFsChainTarget(FrostFsTargetType.Container, containerId.GetValue()));
while (true)
{
await Task.Delay(1000);
var chains = await client.ListChainAsync(listChainPrm, default);
if (chains.Length > 0)
break;
}
await Task.Delay(8000);
}
}

View file

@ -11,9 +11,15 @@ namespace FrostFS.SDK.Tests.Smoke;
public abstract class SmokeTestsBase
{
internal readonly string keyString = "KzPXA6669m2pf18XmUdoR8MnP1pi1PMmefiFujStVFnv7WR5SRmK";
// cluster
internal readonly string url = "http://10.78.128.190:8080";
internal readonly string keyString = "L47c3bunc6bJd7uEAfPUae2VkyupFR9nizoH6jfPonzQxijqH2Ba";
internal readonly string url = "http://172.23.32.4:8080";
// WSL2
//internal readonly string url = "http://172.29.238.97:8080";
//internal readonly string keyString = "KzPXA6669m2pf18XmUdoR8MnP1pi1PMmefiFujStVFnv7WR5SRmK";
//"KwHDAJ66o8FoLBjVbjP2sWBmgBMGjt7Vv4boA7xQrBoAYBE397Aq";
protected ECDsa? Key { get; }

View file

@ -35,7 +35,7 @@ public class PlacementVectorTests(ITestOutputHelper testOutputHelper)
//if (!file.EndsWith("selector_invalid.json"))
// continue;
var fileName = file[(file.LastIndexOf("..\\") + 3)..];
var fileName = file[(file.LastIndexOf("..\\", StringComparison.OrdinalIgnoreCase) + 3)..];
_testOutputHelper.WriteLine($"Open file {fileName}");
var str = File.ReadAllText(file);