Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
aduffeck committed Jun 7, 2024
1 parent a7a1d2d commit 6d7d373
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
17 changes: 2 additions & 15 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -769,14 +756,14 @@ 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",
},
},
],
"services": [
redisService(),
ldapService(),
],
"depends_on": ["unit-test-coverage"],
},
)

Expand Down
6 changes: 6 additions & 0 deletions internal/grpc/services/gateway/storageprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
3 changes: 3 additions & 0 deletions internal/grpc/services/storageprovider/storageprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit 6d7d373

Please sign in to comment.