Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Enable sec. indexes with ACP #2602

Merged
merged 2 commits into from
May 9, 2024
Merged

feat: Enable sec. indexes with ACP #2602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4831bc
Enable sec. indexes for ACP, add tests
islamaliev May 8, 2024
3fa87a7
Added comments to policies
islamaliev May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions internal/db/collection_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,6 @@ func (c *collection) createIndex(
ctx context.Context,
desc client.IndexDescription,
) (CollectionIndex, error) {
// Don't allow creating index on a permissioned collection, until following is implemented.
// TODO-ACP: ACP <> INDEX https://github.com/sourcenetwork/defradb/issues/2365
if c.Description().Policy.HasValue() {
return nil, ErrCanNotCreateIndexOnCollectionWithPolicy
}

if desc.Name != "" && !schema.IsValidIndexName(desc.Name) {
return nil, schema.NewErrIndexWithInvalidName("!")
}
Expand Down
1 change: 0 additions & 1 deletion internal/db/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const (

var (
ErrFailedToGetCollection = errors.New(errFailedToGetCollection)
ErrCanNotCreateIndexOnCollectionWithPolicy = errors.New("can not create index on a collection with a policy")
ErrSubscriptionsNotAllowed = errors.New("server does not accept subscriptions")
ErrInvalidFilter = errors.New("invalid filter")
ErrCollectionAlreadyExists = errors.New(errCollectionAlreadyExists)
Expand Down
92 changes: 10 additions & 82 deletions tests/integration/acp/index/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,46 +17,14 @@ import (
acpUtils "github.com/sourcenetwork/defradb/tests/integration/acp"
)

// This test documents that we don't allow creating indexes on collections that have policy
// until the following is implemented:
// TODO-ACP: ACP <> P2P https://github.com/sourcenetwork/defradb/issues/2365
func TestACP_IndexCreateWithSeparateRequest_OnCollectionWithPolicy_ReturnError(t *testing.T) {
func TestACP_IndexCreateWithSeparateRequest_OnCollectionWithPolicy_NoError(t *testing.T) {
test := testUtils.TestCase{
Description: "Test acp, with creating new index using separate request on permissioned collection, error",
Description: "Test acp, with creating new index using separate request on permissioned collection, no error",
Actions: []any{

testUtils.AddPolicy{

Identity: acpUtils.Actor1Identity,

Policy: `
description: a test policy which marks a collection in a database as a resource

actor:
name: actor

resources:
users:
permissions:
read:
expr: owner + reader
write:
expr: owner

relations:
owner:
types:
- actor
reader:
types:
- actor
admin:
manages:
- reader
types:
- actor
`,

Identity: acpUtils.Actor1Identity,
Policy: userPolicy,
ExpectedPolicyID: "53980e762616fcffbe76307995895e862f87ef3f21d509325d1dc772a770b001",
},

Expand All @@ -74,12 +42,8 @@ func TestACP_IndexCreateWithSeparateRequest_OnCollectionWithPolicy_ReturnError(t

testUtils.CreateIndex{
CollectionID: 0,

IndexName: "some_index",

FieldName: "name",

ExpectedError: "can not create index on a collection with a policy",
IndexName: "some_index",
FieldName: "name",
},

testUtils.Request{
Expand All @@ -99,46 +63,14 @@ func TestACP_IndexCreateWithSeparateRequest_OnCollectionWithPolicy_ReturnError(t
testUtils.ExecuteTestCase(t, test)
}

// This test documents that we don't allow creating indexes on collections that have policy
// until the following is implemented:
// TODO-ACP: ACP <> P2P https://github.com/sourcenetwork/defradb/issues/2365
func TestACP_IndexCreateWithDirective_OnCollectionWithPolicy_ReturnError(t *testing.T) {
func TestACP_IndexCreateWithDirective_OnCollectionWithPolicy_NoError(t *testing.T) {
test := testUtils.TestCase{
Description: "Test acp, with creating new index using directive on permissioned collection, error",
Description: "Test acp, with creating new index using directive on permissioned collection, no error",
Actions: []any{

testUtils.AddPolicy{

Identity: acpUtils.Actor1Identity,

Policy: `
description: a test policy which marks a collection in a database as a resource

actor:
name: actor

resources:
users:
permissions:
read:
expr: owner + reader
write:
expr: owner

relations:
owner:
types:
- actor
reader:
types:
- actor
admin:
manages:
- reader
types:
- actor
`,

Identity: acpUtils.Actor1Identity,
Policy: userPolicy,
ExpectedPolicyID: "53980e762616fcffbe76307995895e862f87ef3f21d509325d1dc772a770b001",
},

Expand All @@ -152,8 +84,6 @@ func TestACP_IndexCreateWithDirective_OnCollectionWithPolicy_ReturnError(t *test
age: Int
}
`,

ExpectedError: "can not create index on a collection with a policy",
},

testUtils.Request{
Expand All @@ -164,8 +94,6 @@ func TestACP_IndexCreateWithDirective_OnCollectionWithPolicy_ReturnError(t *test
age
}
}`,

ExpectedError: `Cannot query field "Users" on type "Query"`,
},
},
}
Expand Down
89 changes: 89 additions & 0 deletions tests/integration/acp/index/fixture.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// Copyright 2024 Democratized Data Foundation
//
// Use of this software is governed by the Business Source License
// included in the file licenses/BSL.txt.
//
// As of the Change Date specified in that file, in accordance with
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.

package test_acp_index

// policy id: "53980e762616fcffbe76307995895e862f87ef3f21d509325d1dc772a770b001"
const userPolicy = `
description: a test policy which marks a collection in a database as a resource

actor:
name: actor

resources:
users:
permissions:
read:
expr: owner + reader
write:
expr: owner

relations:
owner:
types:
- actor
reader:
types:
- actor
admin:
manages:
- reader
types:
- actor
`

// policy id: "68a4e64d5034b8a0565a90cd36483de0d61e0ea2450cf57c1fa8d27cbbf17c2c"
const bookAuthorPolicy = `
description: a test policy which marks a collection in a database as a resource

actor:
name: actor

resources:
author:
permissions:
read:
expr: owner + reader
write:
expr: owner

relations:
owner:
types:
- actor
reader:
types:
- actor
admin:
manages:
- reader
types:
- actor

book:
permissions:
read:
expr: owner + reader
write:
expr: owner

relations:
owner:
types:
- actor
reader:
types:
- actor
admin:
manages:
- reader
types:
- actor
`
Loading
Loading