package localdb
import (
- "context"
"io/fs"
"path/filepath"
"regexp"
"strings"
"time"
- "git.arvados.org/arvados.git/lib/config"
- "git.arvados.org/arvados.git/lib/controller/rpc"
+ "git.arvados.org/arvados.git/lib/ctrlctx"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
- "git.arvados.org/arvados.git/sdk/go/auth"
- "git.arvados.org/arvados.git/sdk/go/ctxlog"
"git.arvados.org/arvados.git/sdk/go/keepclient"
check "gopkg.in/check.v1"
)
var _ = check.Suite(&CollectionSuite{})
type CollectionSuite struct {
- cluster *arvados.Cluster
- localdb *Conn
- railsSpy *arvadostest.Proxy
-}
-
-func (s *CollectionSuite) TearDownSuite(c *check.C) {
- // Undo any changes/additions to the user database so they
- // don't affect subsequent tests.
- arvadostest.ResetEnv()
- c.Check(arvados.NewClientFromEnv().RequestAndDecode(nil, "POST", "database/reset", nil, nil), check.IsNil)
-}
-
-func (s *CollectionSuite) SetUpTest(c *check.C) {
- cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
- c.Assert(err, check.IsNil)
- s.cluster, err = cfg.GetCluster("")
- c.Assert(err, check.IsNil)
- s.localdb = NewConn(s.cluster)
- s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI)
- *s.localdb.railsProxy = *rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider)
-}
-
-func (s *CollectionSuite) TearDownTest(c *check.C) {
- s.railsSpy.Close()
-}
-
-func (s *CollectionSuite) setUpVocabulary(c *check.C, testVocabulary string) {
- if testVocabulary == "" {
- testVocabulary = `{
- "strict_tags": false,
- "tags": {
- "IDTAGIMPORTANCES": {
- "strict": true,
- "labels": [{"label": "Importance"}, {"label": "Priority"}],
- "values": {
- "IDVALIMPORTANCES1": { "labels": [{"label": "Critical"}, {"label": "Urgent"}, {"label": "High"}] },
- "IDVALIMPORTANCES2": { "labels": [{"label": "Normal"}, {"label": "Moderate"}] },
- "IDVALIMPORTANCES3": { "labels": [{"label": "Low"}] }
- }
- }
- }
- }`
- }
- voc, err := arvados.NewVocabulary([]byte(testVocabulary), []string{})
- c.Assert(err, check.IsNil)
- s.cluster.API.VocabularyPath = "foo"
- s.localdb.vocabularyCache = voc
+ localdbSuite
}
func (s *CollectionSuite) TestCollectionCreateAndUpdateWithProperties(c *check.C) {
s.setUpVocabulary(c, "")
- ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
tests := []struct {
name string
c.Log(c.TestName()+" ", tt.name)
// Create with properties
- coll, err := s.localdb.CollectionCreate(ctx, arvados.CreateOptions{
+ coll, err := s.localdb.CollectionCreate(s.userctx, arvados.CreateOptions{
Select: []string{"uuid", "properties"},
Attrs: map[string]interface{}{
"properties": tt.props,
}
// Create, then update with properties
- coll, err = s.localdb.CollectionCreate(ctx, arvados.CreateOptions{})
+ coll, err = s.localdb.CollectionCreate(s.userctx, arvados.CreateOptions{})
c.Assert(err, check.IsNil)
- coll, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
+ coll, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
UUID: coll.UUID,
Select: []string{"uuid", "properties"},
Attrs: map[string]interface{}{
}
}
-func (s *CollectionSuite) TestCollectionUpdateFiles(c *check.C) {
- ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.AdminToken}})
- foo, err := s.localdb.railsProxy.CollectionCreate(ctx, arvados.CreateOptions{
+func (s *CollectionSuite) TestCollectionReplaceFiles(c *check.C) {
+ adminctx := ctrlctx.NewWithToken(s.ctx, s.cluster, arvadostest.AdminToken)
+ foo, err := s.localdb.railsProxy.CollectionCreate(adminctx, arvados.CreateOptions{
Attrs: map[string]interface{}{
"owner_uuid": arvadostest.ActiveUserUUID,
"manifest_text": ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo.txt\n",
}})
c.Assert(err, check.IsNil)
- s.localdb.signCollection(ctx, &foo)
- foobarbaz, err := s.localdb.railsProxy.CollectionCreate(ctx, arvados.CreateOptions{
+ s.localdb.signCollection(adminctx, &foo)
+ foobarbaz, err := s.localdb.railsProxy.CollectionCreate(adminctx, arvados.CreateOptions{
Attrs: map[string]interface{}{
"owner_uuid": arvadostest.ActiveUserUUID,
"manifest_text": "./foo/bar 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz.txt\n",
}})
c.Assert(err, check.IsNil)
- s.localdb.signCollection(ctx, &foobarbaz)
- wazqux, err := s.localdb.railsProxy.CollectionCreate(ctx, arvados.CreateOptions{
+ s.localdb.signCollection(adminctx, &foobarbaz)
+ wazqux, err := s.localdb.railsProxy.CollectionCreate(adminctx, arvados.CreateOptions{
Attrs: map[string]interface{}{
"owner_uuid": arvadostest.ActiveUserUUID,
"manifest_text": "./waz d85b1213473c2fd7c2045020a6b9c62b+3 0:3:qux.txt\n",
}})
c.Assert(err, check.IsNil)
- s.localdb.signCollection(ctx, &wazqux)
-
- ctx = auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
+ s.localdb.signCollection(adminctx, &wazqux)
// Create using content from existing collections
- dst, err := s.localdb.CollectionCreate(ctx, arvados.CreateOptions{
+ dst, err := s.localdb.CollectionCreate(s.userctx, arvados.CreateOptions{
+ ReplaceFiles: map[string]string{
+ "/f": foo.PortableDataHash + "/foo.txt",
+ "/b": foobarbaz.PortableDataHash + "/foo/bar",
+ "/q": wazqux.PortableDataHash + "/",
+ "/w": wazqux.PortableDataHash + "/waz",
+ },
Attrs: map[string]interface{}{
"owner_uuid": arvadostest.ActiveUserUUID,
- "splices": map[string]string{
- "/f": foo.PortableDataHash + "/foo.txt",
- "/b": foobarbaz.PortableDataHash + "/foo/bar",
- "/q": wazqux.PortableDataHash + "/",
- "/w": wazqux.PortableDataHash + "/waz",
- },
}})
c.Assert(err, check.IsNil)
s.expectFiles(c, dst, "f", "b/baz.txt", "q/waz/qux.txt", "w/qux.txt")
// Delete a file and a directory
- dst, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
+ dst, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
UUID: dst.UUID,
- Attrs: map[string]interface{}{
- "splices": map[string]string{
- "/f": "",
- "/q/waz": "",
- },
+ ReplaceFiles: map[string]string{
+ "/f": "",
+ "/q/waz": "",
}})
c.Assert(err, check.IsNil)
s.expectFiles(c, dst, "b/baz.txt", "q/", "w/qux.txt")
// Move and copy content within collection
- dst, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
+ dst, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
UUID: dst.UUID,
- Attrs: map[string]interface{}{
- "splices": map[string]string{
- // Note splicing content to
- // /b/corge.txt but removing
- // everything else from /b
- "/b": "",
- "/b/corge.txt": dst.PortableDataHash + "/b/baz.txt",
- "/quux/corge.txt": dst.PortableDataHash + "/b/baz.txt",
- },
+ ReplaceFiles: map[string]string{
+ // Note splicing content to /b/corge.txt but
+ // removing everything else from /b
+ "/b": "",
+ "/b/corge.txt": dst.PortableDataHash + "/b/baz.txt",
+ "/quux/corge.txt": dst.PortableDataHash + "/b/baz.txt",
}})
c.Assert(err, check.IsNil)
s.expectFiles(c, dst, "b/corge.txt", "q/", "w/qux.txt", "quux/corge.txt")
// Remove everything except one file
- dst, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
+ dst, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
UUID: dst.UUID,
- Attrs: map[string]interface{}{
- "splices": map[string]string{
- "/": "",
- "/b/corge.txt": dst.PortableDataHash + "/b/corge.txt",
- },
+ ReplaceFiles: map[string]string{
+ "/": "",
+ "/b/corge.txt": dst.PortableDataHash + "/b/corge.txt",
}})
c.Assert(err, check.IsNil)
s.expectFiles(c, dst, "b/corge.txt")
// Copy entire collection to root
- dstcopy, err := s.localdb.CollectionCreate(ctx, arvados.CreateOptions{
- Attrs: map[string]interface{}{
- // Note map[string]interface{} here, which is
- // how lib/controller/router requests will
- // look.
- "splices": map[string]interface{}{
- "/": dst.PortableDataHash,
- },
+ dstcopy, err := s.localdb.CollectionCreate(s.userctx, arvados.CreateOptions{
+ ReplaceFiles: map[string]string{
+ "/": dst.PortableDataHash,
}})
c.Check(err, check.IsNil)
c.Check(dstcopy.PortableDataHash, check.Equals, dst.PortableDataHash)
s.expectFiles(c, dstcopy, "b/corge.txt")
- for _, splices := range []map[string]string{
+ // Check invalid targets, sources, and combinations
+ for _, badrepl := range []map[string]string{
{
"/foo/nope": dst.PortableDataHash + "/b",
"/foo": dst.PortableDataHash + "/b",
{"/bad": "bad/b"},
{"/bad": dst.UUID + "/b"},
} {
- _, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
- UUID: dst.UUID,
- Attrs: map[string]interface{}{
- "splices": splices,
- }})
- c.Logf("splices %#v\n... got err: %s", splices, err)
- c.Check(err, check.NotNil)
- }
- for _, splices := range []interface{}{
- map[string]int{"foo": 1},
- map[int]string{1: "foo"},
- } {
- _, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
- UUID: dst.UUID,
- Attrs: map[string]interface{}{
- "splices": splices,
- }})
- c.Logf("splices %#v\n... got err: %s", splices, err)
+ _, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
+ UUID: dst.UUID,
+ ReplaceFiles: badrepl,
+ })
+ c.Logf("badrepl %#v\n... got err: %s", badrepl, err)
c.Check(err, check.NotNil)
}
+
+ // Check conflicting replace_files and manifest_text
+ _, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
+ UUID: dst.UUID,
+ ReplaceFiles: map[string]string{"/": ""},
+ Attrs: map[string]interface{}{
+ "manifest_text": ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:z\n",
+ }})
+ c.Logf("replace_files+manifest_text\n... got err: %s", err)
+ c.Check(err, check.ErrorMatches, "ambiguous request: both.*replace_files.*manifest_text.*")
}
// expectFiles checks coll's directory structure against the given
c.Assert(err, check.IsNil)
kc, err := keepclient.MakeKeepClient(ac)
c.Assert(err, check.IsNil)
- cfs, err := coll.FileSystem(arvados.NewClientFromEnv(), kc)
+ cfs, err := coll.FileSystem(client, kc)
c.Assert(err, check.IsNil)
var found []string
nonemptydirs := map[string]bool{}
}
func (s *CollectionSuite) TestSignatures(c *check.C) {
- ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
-
- resp, err := s.localdb.CollectionGet(ctx, arvados.GetOptions{UUID: arvadostest.FooCollection})
+ resp, err := s.localdb.CollectionGet(s.userctx, arvados.GetOptions{UUID: arvadostest.FooCollection})
c.Check(err, check.IsNil)
c.Check(resp.ManifestText, check.Matches, `(?ms).* acbd[^ ]*\+3\+A[0-9a-f]+@[0-9a-f]+ 0:.*`)
s.checkSignatureExpiry(c, resp.ManifestText, time.Hour*24*7*2)
- resp, err = s.localdb.CollectionGet(ctx, arvados.GetOptions{UUID: arvadostest.FooCollection, Select: []string{"manifest_text"}})
+ resp, err = s.localdb.CollectionGet(s.userctx, arvados.GetOptions{UUID: arvadostest.FooCollection, Select: []string{"manifest_text"}})
c.Check(err, check.IsNil)
c.Check(resp.ManifestText, check.Matches, `(?ms).* acbd[^ ]*\+3\+A[0-9a-f]+@[0-9a-f]+ 0:.*`)
- lresp, err := s.localdb.CollectionList(ctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}})
+ lresp, err := s.localdb.CollectionList(s.userctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}})
c.Check(err, check.IsNil)
if c.Check(lresp.Items, check.HasLen, 1) {
c.Check(lresp.Items[0].UUID, check.Equals, arvadostest.FooCollection)
c.Check(lresp.Items[0].UnsignedManifestText, check.Equals, "")
}
- lresp, err = s.localdb.CollectionList(ctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}, Select: []string{"manifest_text"}})
+ lresp, err = s.localdb.CollectionList(s.userctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}, Select: []string{"manifest_text"}})
c.Check(err, check.IsNil)
if c.Check(lresp.Items, check.HasLen, 1) {
c.Check(lresp.Items[0].ManifestText, check.Matches, `(?ms).* acbd[^ ]*\+3\+A[0-9a-f]+@[0-9a-f]+ 0:.*`)
c.Check(lresp.Items[0].UnsignedManifestText, check.Equals, "")
}
- lresp, err = s.localdb.CollectionList(ctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}, Select: []string{"unsigned_manifest_text"}})
+ lresp, err = s.localdb.CollectionList(s.userctx, arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}}, Select: []string{"unsigned_manifest_text"}})
c.Check(err, check.IsNil)
if c.Check(lresp.Items, check.HasLen, 1) {
c.Check(lresp.Items[0].ManifestText, check.Equals, "")
// early trash date causes lower signature TTL (even if
// trash_at and is_trashed fields are unselected)
- trashed, err := s.localdb.CollectionCreate(ctx, arvados.CreateOptions{
+ trashed, err := s.localdb.CollectionCreate(s.userctx, arvados.CreateOptions{
Select: []string{"uuid", "manifest_text"},
Attrs: map[string]interface{}{
"manifest_text": ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:foo\n",
}})
c.Assert(err, check.IsNil)
s.checkSignatureExpiry(c, trashed.ManifestText, time.Hour)
- resp, err = s.localdb.CollectionGet(ctx, arvados.GetOptions{UUID: trashed.UUID})
+ resp, err = s.localdb.CollectionGet(s.userctx, arvados.GetOptions{UUID: trashed.UUID})
c.Assert(err, check.IsNil)
s.checkSignatureExpiry(c, resp.ManifestText, time.Hour)
// distant future trash date does not cause higher signature TTL
- trashed, err = s.localdb.CollectionUpdate(ctx, arvados.UpdateOptions{
+ trashed, err = s.localdb.CollectionUpdate(s.userctx, arvados.UpdateOptions{
UUID: trashed.UUID,
Attrs: map[string]interface{}{
"trash_at": time.Now().UTC().Add(time.Hour * 24 * 365),
}})
c.Assert(err, check.IsNil)
s.checkSignatureExpiry(c, trashed.ManifestText, time.Hour*24*7*2)
- resp, err = s.localdb.CollectionGet(ctx, arvados.GetOptions{UUID: trashed.UUID})
+ resp, err = s.localdb.CollectionGet(s.userctx, arvados.GetOptions{UUID: trashed.UUID})
c.Assert(err, check.IsNil)
s.checkSignatureExpiry(c, resp.ManifestText, time.Hour*24*7*2)
// Make sure groups/contents doesn't return manifest_text with
// collections (if it did, we'd need to sign it).
- gresp, err := s.localdb.GroupContents(ctx, arvados.GroupContentsOptions{
+ gresp, err := s.localdb.GroupContents(s.userctx, arvados.GroupContentsOptions{
Limit: -1,
Filters: []arvados.Filter{{"uuid", "=", arvadostest.FooCollection}},
Select: []string{"uuid", "manifest_text"},
func (s *CollectionSuite) TestSignaturesDisabled(c *check.C) {
s.localdb.cluster.Collections.BlobSigning = false
- ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
-
- resp, err := s.localdb.CollectionGet(ctx, arvados.GetOptions{UUID: arvadostest.FooCollection})
+ resp, err := s.localdb.CollectionGet(s.userctx, arvados.GetOptions{UUID: arvadostest.FooCollection})
c.Check(err, check.IsNil)
c.Check(resp.ManifestText, check.Matches, `(?ms).* acbd[^ +]*\+3 0:.*`)
}
projects / arvados.git / blobdiff