Add grpc integration tests for the ocis and the owncloud storage driv…

…ers (cs3org#1514)

.drone.star

@@ -94,6 +94,7 @@ def main(ctx):
   return [
     buildAndPublishDocker(),
     buildOnly(),
+    testIntegration(),
     release(),
     litmusOcisOldWebdav(),
     litmusOcisNewWebdav(),
@@ -275,6 +276,39 @@ def buildOnly():
     ]
   }
 
+def testIntegration():
+  return {
+    "kind": "pipeline",
+    "type": "docker",
+    "name": "test-integration",
+    "platform": {
+      "os": "linux",
+      "arch": "amd64",
+    },
+    "trigger": {
+      "event": {
+        "include": [
+          "pull_request",
+        ],
+      },
+    },
+    "steps": [
+      {
+        "name": "test",
+        "image": "registry.cern.ch/docker.io/library/golang:1.13",
+        "commands": [
+          "make test-integration",
+        ],
+        "environment": {
+          "REDIS_ADDRESS": "redis:6379",
+        },
+      }
+    ],
+    "services": [
+      redisService(),
+    ],
+  }
+
 def release():
   return {
     "kind": "pipeline",

Makefile

@@ -42,7 +42,10 @@ build-reva: imports
 	go build -ldflags ${BUILD_FLAGS} -o ./cmd/reva/reva ./cmd/reva
 
 test: off
-	go test -race ./...
+	go test -race $$(go list ./... | grep -v /tests/integration)
+
+test-integration: build-ci
+	cd tests/integration && go test -race ./...
 
 litmus-test-old: build
 	cd tests/oc-integration-tests/local && ../../../cmd/revad/revad -c frontend.toml &

changelog/unreleased/add-grpc-testsuite.md

@@ -0,0 +1,6 @@
+Enhancement: Add grpc test suite for the storage provider
+
+A new test suite has been added which tests the grpc interface to the storage
+provider. It currently runs against the ocis and the owncloud storage drivers.
+
+https://github.com/cs3org/reva/pull/1514

pkg/storage/fs/owncloud/owncloud.go

@@ -1814,6 +1814,9 @@ func (fs *ocfs) listShareFolderRoot(ctx context.Context, sp string, mdKeys []str
 
 	mds, err := ioutil.ReadDir(ip)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, errtypes.NotFound(fs.toStoragePath(ctx, filepath.Dir(ip)))
+		}
 		return nil, errors.Wrap(err, "ocfs: error listing shadow_files")
 	}
 

pkg/storage/utils/ace/ace.go

@@ -187,10 +187,11 @@ func (e *ACE) Grant() *provider.Grant {
 		},
 		Permissions: e.grantPermissionSet(),
 	}
+	id := e.principal[2:]
 	if e.granteeType() == provider.GranteeType_GRANTEE_TYPE_GROUP {
-		g.Grantee.Id = &provider.Grantee_GroupId{GroupId: &grouppb.GroupId{OpaqueId: e.principal}}
+		g.Grantee.Id = &provider.Grantee_GroupId{GroupId: &grouppb.GroupId{OpaqueId: id}}
 	} else if e.granteeType() == provider.GranteeType_GRANTEE_TYPE_USER {
-		g.Grantee.Id = &provider.Grantee_UserId{UserId: &userpb.UserId{OpaqueId: e.principal}}
+		g.Grantee.Id = &provider.Grantee_UserId{UserId: &userpb.UserId{OpaqueId: id}}
 	}
 	return g
 }
@@ -324,7 +325,7 @@ func unmarshalKV(s string) (*ACE, error) {
 func getACEPerm(set *provider.ResourcePermissions) string {
 	var b strings.Builder
 
-	if set.Stat || set.InitiateFileDownload || set.ListContainer {
+	if set.Stat || set.InitiateFileDownload || set.ListContainer || set.GetPath {
 		b.WriteString("r")
 	}
 	if set.InitiateFileUpload || set.Move {

pkg/storage/utils/ace/ace_suite_test.go

@@ -0,0 +1,31 @@
+// Copyright 2018-2021 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package ace_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestAce(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Ace Suite")
+}