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

Jump to bottom

bump authzed-go to 0.4.1 #371

Merged
merged 2 commits into from Jan 10, 2022
Merged

bump authzed-go to 0.4.1 #371

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
2f1948c
bump authzed-go to 0.4.1
ecordell Jan 10, 2022
0b0c9ce
remove unused validation package
ecordell Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/authzed/spicedb/e2e
go 1.17

require (
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43
github.com/authzed/authzed-go v0.4.1
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6
github.com/authzed/spicedb v0.0.0
github.com/brianvoe/gofakeit/v6 v6.10.0
Expand Down
4 changes: 2 additions & 2 deletions e2e/go.sum
View file
Open in desktop
Expand Up @@ -72,8 +72,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43 h1:hnMt/mitjkBq6OKGAtSxCvbQSGNy0c8sBhyPy/NIy+w=
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43/go.mod h1:bsUniBRroq4l5WZMYLO+T9osQa/P2qMwZ+Af8zoJK8Y=
github.com/authzed/authzed-go v0.4.1 h1:EVTP1ZXGnZ8sA8Ojqi5k9Io/nsbaH7lSNqPLiUgwvPE=
github.com/authzed/authzed-go v0.4.1/go.mod h1:bsUniBRroq4l5WZMYLO+T9osQa/P2qMwZ+Af8zoJK8Y=
github.com/authzed/grpcutil v0.0.0-20210913124023-cad23ae5a9e8/go.mod h1:HwO/KbRU3fWXEYHE96kvXnwxzi97tkXD1hfi5UaZ71Y=
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6 h1:izP/rEris51ZmomXb5J0ShyJKqsxTfVKDRnJz0QGbgg=
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6/go.mod h1:rqjY3zyK/YP7NID9+B2BdIRRkvnK+cdf9/qya/zaFZE=
Expand Down
2 changes: 1 addition & 1 deletion e2e/newenemy/newenemy_test.go
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ definition {{.}}/resource {

const (
objIDRegex = "[a-zA-Z0-9_][a-zA-Z0-9/_-]{0,127}"
namespacePrefixRegex = "[a-z][a-z0-9_]{2,62}[a-z0-9]"
namespacePrefixRegex = "[a-z][a-z0-9_]{1,62}[a-z0-9]"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
github.com/Masterminds/squirrel v1.5.2
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43
github.com/authzed/authzed-go v0.4.1
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6
github.com/aws/aws-sdk-go v1.42.25
github.com/benbjohnson/clock v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Expand Up @@ -79,8 +79,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43 h1:hnMt/mitjkBq6OKGAtSxCvbQSGNy0c8sBhyPy/NIy+w=
github.com/authzed/authzed-go v0.3.1-0.20211220220442-a36f72252b43/go.mod h1:bsUniBRroq4l5WZMYLO+T9osQa/P2qMwZ+Af8zoJK8Y=
github.com/authzed/authzed-go v0.4.1 h1:EVTP1ZXGnZ8sA8Ojqi5k9Io/nsbaH7lSNqPLiUgwvPE=
github.com/authzed/authzed-go v0.4.1/go.mod h1:bsUniBRroq4l5WZMYLO+T9osQa/P2qMwZ+Af8zoJK8Y=
github.com/authzed/grpcutil v0.0.0-20210913124023-cad23ae5a9e8/go.mod h1:HwO/KbRU3fWXEYHE96kvXnwxzi97tkXD1hfi5UaZ71Y=
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6 h1:izP/rEris51ZmomXb5J0ShyJKqsxTfVKDRnJz0QGbgg=
github.com/authzed/grpcutil v0.0.0-20211020204402-aba1876830e6/go.mod h1:rqjY3zyK/YP7NID9+B2BdIRRkvnK+cdf9/qya/zaFZE=
Expand Down
2 changes: 1 addition & 1 deletion internal/datastore/test/namespace.go
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import (
)

var (
testNamespace = ns.Namespace("test/test",
testNamespace = ns.Namespace("foo/bar",
ns.Relation("editor", nil, ns.AllowedRelation(testUserNS.Name, "...")),
)

Expand Down
41 changes: 41 additions & 0 deletions internal/services/testconfigs/3letterrbac.yaml
View file
Open in desktop
@@ -0,0 +1,41 @@
---
namespace_configs:
- |
name: "exm/usr"

- |
name: "exm/doc"

relation {
name: "wri"

type_information {
allowed_direct_relations {
namespace: "exm/usr"
relation: "..."
}
}
}

relation {
name: "red"

userset_rewrite {
union {
child { _this {} }
child { computed_userset { relation: "wri" } }
}
}

type_information {
allowed_direct_relations {
namespace: "exm/usr"
relation: "..."
}
}
}

validation_tuples:
- "exm/doc:firstdoc#wri@exm/usr:tom#..."
- "exm/doc:firstdoc#red@exm/usr:fred#..."
- "exm/doc:seconddoc#red@exm/usr:tom#..."
6 changes: 3 additions & 3 deletions internal/services/v0/developer_test.go
View file
Open in desktop
Expand Up @@ -108,11 +108,11 @@ func TestEditCheck(t *testing.T) {
},
{
"invalid namespace name",
`definition foo {}`,
`definition fo {}`,
[]*v0.RelationTuple{},
[]*v0.RelationTuple{},
&v0.DeveloperError{
Message: "parse error in `schema`, line 1, column 1: error in object definition foo: invalid NamespaceDefinition.Name: value does not match regex pattern \"^([a-z][a-z0-9_]{2,62}[a-z0-9]/)?[a-z][a-z0-9_]{2,62}[a-z0-9]$\"",
Message: "parse error in `schema`, line 1, column 1: error in object definition fo: invalid NamespaceDefinition.Name: value does not match regex pattern \"^([a-z][a-z0-9_]{1,62}[a-z0-9]/)?[a-z][a-z0-9_]{1,62}[a-z0-9]$\"",
Kind: v0.DeveloperError_SCHEMA_ISSUE,
Source: v0.DeveloperError_SCHEMA,
Line: 1,
Expand Down Expand Up @@ -732,7 +732,7 @@ func TestDeveloperValidateONR(t *testing.T) {
require.NoError(err)
require.Equal(1, len(resp.RequestErrors))
require.Equal(&v0.DeveloperError{
Message: "invalid RelationTuple.ObjectAndRelation: embedded message failed validation | caused by: invalid ObjectAndRelation.Relation: value does not match regex pattern \"^(\\\\.\\\\.\\\\.|[a-z][a-z0-9_]{2,62}[a-z0-9])$\"",
Message: "invalid RelationTuple.ObjectAndRelation: embedded message failed validation | caused by: invalid ObjectAndRelation.Relation: value does not match regex pattern \"^(\\\\.\\\\.\\\\.|[a-z][a-z0-9_]{1,62}[a-z0-9])$\"",
Kind: v0.DeveloperError_PARSE_ERROR,
Source: v0.DeveloperError_RELATIONSHIP,
Context: `document:somedoc#writerIsNotValid@user:jimmy`,
Expand Down
18 changes: 9 additions & 9 deletions pkg/schemadsl/compiler/compiler_test.go
View file
Open in desktop
Expand Up @@ -48,23 +48,23 @@ func TestCompile(t *testing.T) {
{
"empty def",
&someTenant,
`definition empty {}`,
`definition def {}`,
"",
[]*v0.NamespaceDefinition{
namespace.Namespace("sometenant/empty"),
namespace.Namespace("sometenant/def"),
},
},
{
"simple def",
&someTenant,
`definition simple {
relation foos: bars;
relation foo: bar;
}`,
"",
[]*v0.NamespaceDefinition{
namespace.Namespace("sometenant/simple",
namespace.Relation("foos", nil,
namespace.AllowedRelation("sometenant/bars", "..."),
namespace.Relation("foo", nil,
namespace.AllowedRelation("sometenant/bar", "..."),
),
),
},
Expand Down Expand Up @@ -413,17 +413,17 @@ func TestCompile(t *testing.T) {
{
"invalid definition name",
nil,
`definition someTenant/foo {}`,
"parse error in `invalid definition name`, line 1, column 1: error in object definition someTenant/foo: invalid NamespaceDefinition.Name: value does not match regex pattern \"^([a-z][a-z0-9_]{2,62}[a-z0-9]/)?[a-z][a-z0-9_]{2,62}[a-z0-9]$\"",
`definition someTenant/fo {}`,
"parse error in `invalid definition name`, line 1, column 1: error in object definition someTenant/fo: invalid NamespaceDefinition.Name: value does not match regex pattern \"^([a-z][a-z0-9_]{1,62}[a-z0-9]/)?[a-z][a-z0-9_]{1,62}[a-z0-9]$\"",
[]*v0.NamespaceDefinition{},
},
{
"invalid relation name",
nil,
`definition some_tenant/foos {
relation bar: some_tenant/foos
relation ab: some_tenant/foos
}`,
"parse error in `invalid relation name`, line 2, column 5: error in relation bar: invalid Relation.Name: value does not match regex pattern \"^[a-z][a-z0-9_]{2,62}[a-z0-9]$\"",
"parse error in `invalid relation name`, line 2, column 5: error in relation ab: invalid Relation.Name: value does not match regex pattern \"^[a-z][a-z0-9_]{1,62}[a-z0-9]$\"",
[]*v0.NamespaceDefinition{},
},
{
Expand Down
4 changes: 2 additions & 2 deletions pkg/tuple/tuple.go
View file
Open in desktop
Expand Up @@ -19,10 +19,10 @@ const (
)

const (
namespaceNameExpr = "([a-z][a-z0-9_]{2,61}[a-z0-9]/)?[a-z][a-z0-9_]{2,62}[a-z0-9]"
namespaceNameExpr = "([a-z][a-z0-9_]{1,61}[a-z0-9]/)?[a-z][a-z0-9_]{1,62}[a-z0-9]"
resourceIDExpr = "[a-zA-Z0-9_][a-zA-Z0-9/_-]{0,127}"
subjectIDExpr = "([a-zA-Z0-9_][a-zA-Z0-9/_-]{0,127})|\\*"
relationExpr = "[a-z][a-z0-9_]{2,62}[a-z0-9]"
relationExpr = "[a-z][a-z0-9_]{1,62}[a-z0-9]"
)

var onrExpr = fmt.Sprintf(
Expand Down
69 changes: 0 additions & 69 deletions pkg/validation/identifiers.go
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions pkg/validation/identifiers_test.go
View file
Open in desktop

This file was deleted.