X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e26e7f413351efae4a2ec679cc2e234dc1a5020c..c502c5a50aae825683ee4cff629c6839a4209501:/sdk/go/arvados/fs_project_test.go

diff --git a/sdk/go/arvados/fs_project_test.go b/sdk/go/arvados/fs_project_test.go
index 1a06ce1463..8e7f588156 100644
--- a/sdk/go/arvados/fs_project_test.go
+++ b/sdk/go/arvados/fs_project_test.go
@@ -7,12 +7,12 @@ package arvados
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	check "gopkg.in/check.v1"
 )
 
@@ -40,6 +40,66 @@ func (sc *spyingClient) RequestAndDecode(dst interface{}, method, path string, b
 	return sc.Client.RequestAndDecode(dst, method, path, body, params)
 }
 
+func (s *SiteFSSuite) TestFilterGroup(c *check.C) {
+	// Make sure that a collection and group that match the filter are present,
+	// and that a group that does not match the filter is not present.
+	s.fs.MountProject("fg", fixtureThisFilterGroupUUID)
+
+	_, err := s.fs.OpenFile("/fg/baz_file", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.OpenFile("/fg/A Subproject", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.OpenFile("/fg/A Project", 0, 0)
+	c.Assert(err, check.Not(check.IsNil))
+
+	// An empty filter means everything that is visible should be returned.
+	s.fs.MountProject("fg2", fixtureAFilterGroupTwoUUID)
+
+	_, err = s.fs.OpenFile("/fg2/baz_file", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.OpenFile("/fg2/A Subproject", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.OpenFile("/fg2/A Project", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	// An 'is_a' 'arvados#collection' filter means only collections should be returned.
+	s.fs.MountProject("fg3", fixtureAFilterGroupThreeUUID)
+
+	_, err = s.fs.OpenFile("/fg3/baz_file", 0, 0)
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.OpenFile("/fg3/A Subproject", 0, 0)
+	c.Assert(err, check.Not(check.IsNil))
+
+	// An 'exists' 'arvados#collection' filter means only collections with certain properties should be returned.
+	s.fs.MountProject("fg4", fixtureAFilterGroupFourUUID)
+
+	_, err = s.fs.Stat("/fg4/collection with list property with odd values")
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.Stat("/fg4/collection with list property with even values")
+	c.Assert(err, check.IsNil)
+
+	// A 'contains' 'arvados#collection' filter means only collections with certain properties should be returned.
+	s.fs.MountProject("fg5", fixtureAFilterGroupFiveUUID)
+
+	_, err = s.fs.Stat("/fg5/collection with list property with odd values")
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.Stat("/fg5/collection with list property with string value")
+	c.Assert(err, check.IsNil)
+
+	_, err = s.fs.Stat("/fg5/collection with prop2 5")
+	c.Assert(err, check.Not(check.IsNil))
+
+	_, err = s.fs.Stat("/fg5/collection with list property with even values")
+	c.Assert(err, check.Not(check.IsNil))
+}
+
 func (s *SiteFSSuite) TestCurrentUserHome(c *check.C) {
 	s.fs.MountProject("home", "")
 	s.testHomeProject(c, "/home")
@@ -53,6 +113,7 @@ func (s *SiteFSSuite) testHomeProject(c *check.C, path string) {
 	f, err := s.fs.Open(path)
 	c.Assert(err, check.IsNil)
 	fis, err := f.Readdir(-1)
+	c.Assert(err, check.IsNil)
 	c.Check(len(fis), check.Not(check.Equals), 0)
 
 	ok := false
@@ -119,20 +180,24 @@ func (s *SiteFSSuite) TestProjectReaddirAfterLoadOne(c *check.C) {
 }
 
 func (s *SiteFSSuite) TestSlashInName(c *check.C) {
-	badCollection := Collection{
-		Name:      "bad/collection",
-		OwnerUUID: arvadostest.AProjectUUID,
-	}
-	err := s.client.RequestAndDecode(&badCollection, "POST", "arvados/v1/collections", s.client.UpdateBody(&badCollection), nil)
+	var badCollection Collection
+	err := s.client.RequestAndDecode(&badCollection, "POST", "arvados/v1/collections", nil, map[string]interface{}{
+		"collection": map[string]string{
+			"name":       "bad/collection",
+			"owner_uuid": fixtureAProjectUUID,
+		},
+	})
 	c.Assert(err, check.IsNil)
 	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+badCollection.UUID, nil, nil)
 
-	badProject := Group{
-		Name:       "bad/project",
-		GroupClass: "project",
-		OwnerUUID:  arvadostest.AProjectUUID,
-	}
-	err = s.client.RequestAndDecode(&badProject, "POST", "arvados/v1/groups", s.client.UpdateBody(&badProject), nil)
+	var badProject Group
+	err = s.client.RequestAndDecode(&badProject, "POST", "arvados/v1/groups", nil, map[string]interface{}{
+		"group": map[string]string{
+			"name":        "bad/project",
+			"group_class": "project",
+			"owner_uuid":  fixtureAProjectUUID,
+		},
+	})
 	c.Assert(err, check.IsNil)
 	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/groups/"+badProject.UUID, nil, nil)
 
@@ -144,6 +209,21 @@ func (s *SiteFSSuite) TestSlashInName(c *check.C) {
 		c.Logf("fi.Name() == %q", fi.Name())
 		c.Check(strings.Contains(fi.Name(), "/"), check.Equals, false)
 	}
+
+	// Make a new fs (otherwise content will still be cached from
+	// above) and enable "/" replacement string.
+	s.fs = s.client.SiteFileSystem(s.kc)
+	s.fs.ForwardSlashNameSubstitution("___")
+	dir, err = s.fs.Open("/users/active/A Project/bad___collection")
+	if c.Check(err, check.IsNil) {
+		_, err = dir.Readdir(-1)
+		c.Check(err, check.IsNil)
+	}
+	dir, err = s.fs.Open("/users/active/A Project/bad___project")
+	if c.Check(err, check.IsNil) {
+		_, err = dir.Readdir(-1)
+		c.Check(err, check.IsNil)
+	}
 }
 
 func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
@@ -155,11 +235,13 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
 	_, err = s.fs.Open("/home/A Project/oob")
 	c.Check(err, check.NotNil)
 
-	oob := Collection{
-		Name:      "oob",
-		OwnerUUID: arvadostest.AProjectUUID,
-	}
-	err = s.client.RequestAndDecode(&oob, "POST", "arvados/v1/collections", s.client.UpdateBody(&oob), nil)
+	var oob Collection
+	err = s.client.RequestAndDecode(&oob, "POST", "arvados/v1/collections", nil, map[string]interface{}{
+		"collection": map[string]string{
+			"name":       "oob",
+			"owner_uuid": fixtureAProjectUUID,
+		},
+	})
 	c.Assert(err, check.IsNil)
 	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil)
 
@@ -179,13 +261,33 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
 	err = wf.Close()
 	c.Check(err, check.IsNil)
 
-	// Delete test.txt behind s.fs's back by updating the
-	// collection record with the old (empty) ManifestText.
-	err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, s.client.UpdateBody(&oob), nil)
-	c.Assert(err, check.IsNil)
+	err = project.Sync()
+	c.Check(err, check.IsNil)
+	_, err = s.fs.Open("/home/A Project/oob/test.txt")
+	c.Check(err, check.IsNil)
 
+	// Sync again to mark the project dir as stale, so the
+	// collection gets reloaded from the controller on next
+	// lookup.
 	err = project.Sync()
 	c.Check(err, check.IsNil)
+
+	// Ensure collection was flushed by Sync
+	var latest Collection
+	err = s.client.RequestAndDecode(&latest, "GET", "arvados/v1/collections/"+oob.UUID, nil, nil)
+	c.Check(err, check.IsNil)
+	c.Check(latest.ManifestText, check.Matches, `.*:test.txt.*\n`)
+
+	// Delete test.txt behind s.fs's back by updating the
+	// collection record with an empty ManifestText.
+	err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, nil, map[string]interface{}{
+		"collection": map[string]string{
+			"manifest_text":      "",
+			"portable_data_hash": "d41d8cd98f00b204e9800998ecf8427e+0",
+		},
+	})
+	c.Assert(err, check.IsNil)
+
 	_, err = s.fs.Open("/home/A Project/oob/test.txt")
 	c.Check(err, check.NotNil)
 	_, err = s.fs.Open("/home/A Project/oob")
@@ -194,8 +296,53 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
 	err = s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil)
 	c.Assert(err, check.IsNil)
 
-	err = project.Sync()
+	wf, err = s.fs.OpenFile("/home/A Project/oob/test.txt", os.O_CREATE|os.O_RDWR, 0700)
+	c.Assert(err, check.IsNil)
+	err = wf.Close()
 	c.Check(err, check.IsNil)
+
+	err = project.Sync()
+	c.Check(err, check.NotNil) // can't update the deleted collection
 	_, err = s.fs.Open("/home/A Project/oob")
-	c.Check(err, check.NotNil)
+	c.Check(err, check.IsNil) // parent dir still has old collection -- didn't reload, because Sync failed
+}
+
+func (s *SiteFSSuite) TestProjectUnsupportedOperations(c *check.C) {
+	s.fs.MountByID("by_id")
+	s.fs.MountProject("home", "")
+
+	_, err := s.fs.OpenFile("/home/A Project/newfilename", os.O_CREATE|os.O_RDWR, 0)
+	c.Check(err, ErrorIs, ErrInvalidOperation)
+
+	err = s.fs.Mkdir("/home/A Project/newdirname", 0)
+	c.Check(err, ErrorIs, ErrInvalidOperation)
+
+	err = s.fs.Mkdir("/by_id/newdirname", 0)
+	c.Check(err, ErrorIs, ErrInvalidOperation)
+
+	err = s.fs.Mkdir("/by_id/"+fixtureAProjectUUID+"/newdirname", 0)
+	c.Check(err, ErrorIs, ErrInvalidOperation)
+
+	_, err = s.fs.OpenFile("/home/A Project", 0, 0)
+	c.Check(err, check.IsNil)
+}
+
+type errorIsChecker struct {
+	*check.CheckerInfo
+}
+
+var ErrorIs check.Checker = errorIsChecker{
+	&check.CheckerInfo{Name: "ErrorIs", Params: []string{"value", "target"}},
+}
+
+func (checker errorIsChecker) Check(params []interface{}, names []string) (result bool, errStr string) {
+	err, ok := params[0].(error)
+	if !ok {
+		return false, ""
+	}
+	target, ok := params[1].(error)
+	if !ok {
+		return false, ""
+	}
+	return errors.Is(err, target), ""
 }