From 7b05338492ba0f2be0462006490e4d7d272e0aca Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 28 Jun 2023 17:03:07 +0300 Subject: [PATCH] [#2] Update integration test to FrostFS AIO image Signed-off-by: Alex Vanin --- cmd/frostfs-rest-gw/integration_test.go | 18 ++++++++++++------ internal/util/transformers_test.go | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cmd/frostfs-rest-gw/integration_test.go b/cmd/frostfs-rest-gw/integration_test.go index 0bb6a7b..0fa56a1 100644 --- a/cmd/frostfs-rest-gw/integration_test.go +++ b/cmd/frostfs-rest-gw/integration_test.go @@ -80,12 +80,9 @@ func runLocalTests(ctx context.Context, t *testing.T, key *keys.PrivateKey) { } func runTestInContainer(rootCtx context.Context, t *testing.T, key *keys.PrivateKey) { - aioImage := "nspccdev/neofs-aio-testcontainer:" + aioImage := "truecloudlab/frostfs-aio:" versions := []string{ - "0.29.0", - "0.30.0", - "0.32.0", - "latest", + "1.2.7", } for _, version := range versions { @@ -756,7 +753,16 @@ func restObjectDelete(ctx context.Context, t *testing.T, p *pool.Pool, owner *us Role: models.NewRole(models.RoleOTHERS), Keys: []string{}, }}, - }}, + }, + { + Operation: models.NewOperation(models.OperationHEAD), + Action: models.NewAction(models.ActionALLOW), + Filters: []*models.Filter{}, + Targets: []*models.Target{{ + Role: models.NewRole(models.RoleOTHERS), + Keys: []string{}, + }}, + }}, } bearer.Object = append(bearer.Object, getRestrictBearerRecords()...) diff --git a/internal/util/transformers_test.go b/internal/util/transformers_test.go index 5c4a735..71ee685 100644 --- a/internal/util/transformers_test.go +++ b/internal/util/transformers_test.go @@ -16,7 +16,7 @@ func TestErrors(t *testing.T) { resp := NewErrorResponse(apiErr) data, err := json.Marshal(resp) require.NoError(t, err) - require.Equal(t, `{"code":3072,"message":"some context: status: code = 3072","type":"API"}`, string(data)) + require.Equal(t, `{"code":3072,"message":"some context: status: code = 3072 message = container not found","type":"API"}`, string(data)) gwErr := fmt.Errorf("some context: %w", errors.New("sanity check error"))