Skip to content

Commit

Permalink
bump authzed-go to 0.4.0
Browse files Browse the repository at this point in the history 
this adds support for 3 character type and relation names

see https://github.com/authzed/authzed-go/releases/tag/v0.4.0 for more
  • Loading branch information
@ecordell
ecordell committed Jan 10, 2022
1 parent fac38b3 commit 587e5a2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion e2e/go.mod
View file
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
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 go.mod
View file
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
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
6 changes: 3 additions & 3 deletions internal/services/v0/developer_test.go
View file
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
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

0 comments on commit 587e5a2

Please sign in to comment.