Create function to define valid set of scopes for each resource #5558
Conversation
| @@ -38,3 +44,20 @@ var Map = map[string]Type{ | |||
| Org.String(): Org, | |||
| Project.String(): Project, | |||
| } | |||
|
|
|||
| // AllowedIn returns the set of Scopes a known Resource type is allowed in. | |||
| func AllowedIn(ctx context.Context, r resource.Type) ([]Type, error) { | |||
There was a problem hiding this comment.
I believe we wanted this to live under the resource package as a resource.Type method:
There was a problem hiding this comment.
There are also some other methods in the resource package that are not methods on resource.Type. We wanted to update those as well. These methods: Parent, HasChildTypes & TopLevelType
There was a problem hiding this comment.
Agh, I forgot >.< sorry -- added: a4bafe1
There was a problem hiding this comment.
Do you plan on moving AllowedIn to boundary/internal/types/resource/resource.go? That is where we wanted this to live so resources can just check which scopes they are allowed in with resource.AllowedIn. Not under the scope
There was a problem hiding this comment.
If AllowedIn() lived in resource package, we'd have to declare a new scope domain type in the resource package. I didn't like the idea of declaring redundant types (ScopeType and Scope), hence this function living in the scope package.
scope indirectly imports the resource package as well, so we can't import scope.Type into the resource package
…ceType` This allows us to call scope.AllowedIn() in one place vs in each implementation of `validScopeTypes`
dkanney
force-pushed
the
dkanney-define-valid-set-of-scopes-for-each-resource
branch
from
ef5ae30 to
b46ccd7
Compare
| @@ -142,22 +143,22 @@ var Map = map[string]Type{ | |||
|
|
|||
| // Parent returns the parent type for a given type; if there is no parent, it | |||
| // returns the incoming type | |||
| func Parent(in Type) Type { | |||
| switch in { | |||
| func (r Type) Parent() Type { | |||
There was a problem hiding this comment.
Will also need to update the test in resource_test.go to update all the function signature changes in here
…new resource type
dkanney
force-pushed
the
dkanney-define-valid-set-of-scopes-for-each-resource
branch
from
b46ccd7 to
ed329f3
Compare
| @@ -38,3 +44,20 @@ var Map = map[string]Type{ | |||
| Org.String(): Org, | |||
| Project.String(): Project, | |||
| } | |||
|
|
|||
| // AllowedIn returns the set of Scopes a known Resource type is allowed in. | |||
| func AllowedIn(ctx context.Context, r resource.Type) ([]Type, error) { | |||
There was a problem hiding this comment.
Do you plan on moving AllowedIn to boundary/internal/types/resource/resource.go? That is where we wanted this to live so resources can just check which scopes they are allowed in with resource.AllowedIn. Not under the scope
| @@ -57,8 +57,8 @@ func (a *authAccount) VetForWrite(ctx context.Context, r db.Reader, opType db.Op | |||
| return nil | |||
| } | |||
|
|
|||
| func (a *authAccount) validScopeTypes() []scope.Type { | |||
| return []scope.Type{scope.Global, scope.Org} | |||
| func (a *authAccount) getResourceType() resource.Type { | |||
There was a problem hiding this comment.
Is there a reason we had to update this method?
There was a problem hiding this comment.
Technically no -- I previously had validScopeTypes() return scope.AllowedIn(<some resource type>). I'm fine with either change - can revert if that change would be easier to understand
No description provided.