From 6d7d37385ba3cf3e1f434a9226afcf0b0edcad25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 7 Jun 2024 10:46:12 +0200 Subject: [PATCH] WIP --- .drone.star | 17 ++--------------- .../grpc/services/gateway/storageprovider.go | 6 ++++++ .../services/storageprovider/storageprovider.go | 3 +++ 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.drone.star b/.drone.star index dfb9275a61e..1bef36cd8e5 100644 --- a/.drone.star +++ b/.drone.star @@ -104,20 +104,7 @@ def main(ctx): # In order to run specific parts only, specify the parts as # ocisIntegrationTests(6, [1, 4]) - this will only run 1st and 4th parts # implemented for: ocisIntegrationTests, posixfsIntegrationTests and s3ngIntegrationTests - return [ - checkStarlark(), - checkGoGenerate(), - coverage(), - buildOnly(), - testIntegration(), - litmusOcisOldWebdav(), - litmusOcisNewWebdav(), - litmusOcisSpacesDav(), - cs3ApiValidatorOcis(), - cs3ApiValidatorS3NG(), - # virtual views don't work on edge at the moment - #virtualViews(), - ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12) + posixfsIntegrationTests(6) + return posixfsIntegrationTests(1) def coverage(): return { @@ -769,6 +756,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []): "DIVIDE_INTO_NUM_PARTS": parallelRuns, "RUN_PART": runPart, "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-POSIX-storage.md", + "BEHAT_FEATURE": "tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature", }, }, ], @@ -776,7 +764,6 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []): redisService(), ldapService(), ], - "depends_on": ["unit-test-coverage"], }, ) diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go index 1541fff8745..a0170b3672c 100644 --- a/internal/grpc/services/gateway/storageprovider.go +++ b/internal/grpc/services/gateway/storageprovider.go @@ -301,6 +301,9 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp spaces = append(spaces, decodeSpaces(providerInfo)...) } + log := appctx.GetLogger(ctx) + log.Info().Interface("spaces", spaces).Msg("ListStorageSpaces") + return &provider.ListStorageSpacesResponse{ Status: status.NewOK(ctx), StorageSpaces: spaces, @@ -636,6 +639,9 @@ func (s *svc) CreateContainer(ctx context.Context, req *provider.CreateContainer } res, err := c.CreateContainer(ctx, req) + + log := appctx.GetLogger(ctx) + log.Info().Interface("res", res).Interface("err", err).Msg("CreateContainer") if err != nil { return &provider.CreateContainerResponse{ Status: status.NewStatusFromErrType(ctx, "gateway could not call CreateContainer", err), diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go index d6b8fe1784a..b36dd88e702 100644 --- a/internal/grpc/services/storageprovider/storageprovider.go +++ b/internal/grpc/services/storageprovider/storageprovider.go @@ -586,6 +586,7 @@ func (s *Service) ListStorageSpaces(ctx context.Context, req *provider.ListStora s.addMissingStorageProviderID(sp.GetRoot(), sp.GetId()) } + log.Info().Interface("spaces", spaces).Msg("ListStorageSpaces") return &provider.ListStorageSpacesResponse{ Status: status.NewOK(ctx), @@ -679,6 +680,8 @@ func (s *Service) CreateContainer(ctx context.Context, req *provider.CreateConta } err := s.Storage.CreateDir(ctx, req.Ref) + log := appctx.GetLogger(ctx) + log.Info().Interface("err", err).Msg("CreateContainer") return &provider.CreateContainerResponse{ Status: status.NewStatusFromErrType(ctx, "create container", err),