Roles and policies filter

CONTRIBUTING.md

@@ -59,11 +59,15 @@ To make a pull request, you will need a GitHub account; if you are unclear on th
 documentation on [forking](https://help.github.com/articles/fork-a-repo) and [pull requests](https://help.github.com/articles/using-pull-requests).
 Pull requests should be targeted at the `master` branch. Before creating a pull request, go through this checklist:
 
-1. Create a feature branch off of `master` so that changes do not get mixed up.
-1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `master` branch.
-1. Run the full project test suite with the `go test ./...` (or equivalent) command and confirm that it passes.
-1. Run `gofmt -s` (if the project is written in Go).
-1. Ensure that each commit has a subsystem prefix (ex: `controller: `).
+1. Fork this repository and create a branch off of `master` so that changes do not get mixed up.
+2. Create a local directory ory in your `$GOPATH/src/github.com`
+3. `cd $GOPATH/src/github.com` and `git clone <YOUR_FORKED_REPO>`
+4. Make sure `keto` resides in `$GOPATH/src/github.com/ory/keto`
+5. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `master` branch.
+6. Run the full project test suite with the `go test ./...` (or equivalent) command and confirm that it passes.
+7. Run `gofmt -s` (if the project is written in Go).
+8. Ensure that each commit has a subsystem prefix (ex: `controller: `).
+9. To run make scripts like `make sdk`, please make sure to install [go-swagger](https://github.com/go-swagger/go-swagger/blob/master/docs/install.md) and [goreturns](https://github.com/sqs/goreturns).
 
 Pull requests will be treated as "review requests," and maintainers will give feedback on the style and substance of the patch.
 

cmd/engines_acp_ory_roles_list.go

@@ -37,9 +37,10 @@ var enginesAcpOryRolesListCmd = &cobra.Command{
 
 		limit := int64(flagx.MustGetInt(cmd, "limit"))
 		offset := int64(flagx.MustGetInt(cmd, "offset"))
+		member := flagx.MustGetString(cmd, "member")
 		c := client.NewClient(cmd)
 		r, err := c.Engines.ListOryAccessControlPolicyRoles(
-			engines.NewListOryAccessControlPolicyRolesParams().WithFlavor(args[0]).WithLimit(&limit).WithOffset(&offset),
+			engines.NewListOryAccessControlPolicyRolesParams().WithFlavor(args[0]).WithLimit(&limit).WithOffset(&offset).WithMember(&member),
 		)
 		cmdx.Must(err, "Unable to list ORY Access Control Policy Roles: %s", err)
 		fmt.Println(cmdx.FormatResponse(r.Payload))
@@ -48,6 +49,7 @@ var enginesAcpOryRolesListCmd = &cobra.Command{
 
 func init() {
 	enginesAcpOryRolesCmd.AddCommand(enginesAcpOryRolesListCmd)
+	enginesAcpOryRolesListCmd.Flags().String("member", "", "Member ID for whom roles are being fetched")
 	enginesAcpOryRolesListCmd.Flags().Int("limit", 100, "Limit the items being fetched")
 	enginesAcpOryRolesListCmd.Flags().Int("offset", 0, "Set the offset for fetching items")
 }

engine/ladon/doc.go

@@ -245,6 +245,11 @@ type listOryAccessControlPolicyRoles struct {
 	// required: true
 	Flavor string `json:"flavor"`
 
+	// The Member (ID) for which the roles are to be listed (Optional).
+	// in: query
+	// required: false
+	Member string `json:"member"`
+
 	// The maximum amount of policies returned.
 	//
 	// in: query

engine/ladon/handler.go

@@ -289,7 +289,7 @@ func (e *Engine) Register(r *httprouter.Router) {
 }
 
 func (e *Engine) rolesList(ctx context.Context, r *http.Request, ps httprouter.Params) (*kstorage.ListRequest, error) {
-	var p Roles
+	var p kstorage.Roles
 
 	f, err := flavor(ps)
 	if err != nil {
@@ -299,6 +299,7 @@ func (e *Engine) rolesList(ctx context.Context, r *http.Request, ps httprouter.P
 	return &kstorage.ListRequest{
 		Collection: roleCollection(f),
 		Value:      &p,
+		FilterFunc: kstorage.ListByQuery,
 	}, nil
 }
 
@@ -426,7 +427,7 @@ func (e *Engine) policiesCreate(ctx context.Context, r *http.Request, ps httprou
 }
 
 func (e *Engine) policiesList(ctx context.Context, r *http.Request, ps httprouter.Params) (*kstorage.ListRequest, error) {
-	var p Policies
+	var p kstorage.Policies
 
 	f, err := flavor(ps)
 	if err != nil {
@@ -436,6 +437,7 @@ func (e *Engine) policiesList(ctx context.Context, r *http.Request, ps httproute
 	return &kstorage.ListRequest{
 		Collection: policyCollection(f),
 		Value:      &p,
+		FilterFunc: kstorage.ListByQuery,
 	}, nil
 }