vendor: Remove ORY Hydra dependency (#44)

Signed-off-by: arekkas <[email protected]>
ory · Aug 31, 2018 · d487344 · d487344
1 parent 9a45107
commit d487344
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/policy/handler.go b/policy/handler.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory/herodot"
-	"github.com/ory/hydra/pkg"
 	"github.com/ory/ladon"
 	"github.com/ory/pagination"
 	"github.com/pborman/uuid"
@@ -143,7 +142,7 @@ func (h *Handler) Get(w http.ResponseWriter, r *http.Request, ps httprouter.Para
 	policy, err := h.Manager.Get(ps.ByName("id"))
 	if err != nil {
 		if err.Error() == "Not found" {
-			h.H.WriteError(w, r, errors.WithStack(pkg.ErrNotFound))
+			h.H.WriteError(w, r, errors.WithStack(&herodot.ErrorNotFound))
 			return
 		}
 		h.H.WriteError(w, r, errors.WithStack(err))

diff --git a/role/manager_memory.go b/role/manager_memory.go
@@ -23,7 +23,7 @@ package role
 import (
 	"sync"
 
-	"github.com/ory/hydra/pkg"
+	"github.com/ory/herodot"
 	"github.com/ory/pagination"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
@@ -54,7 +54,7 @@ func (m *MemoryManager) CreateRole(r *Role) error {
 
 func (m *MemoryManager) GetRole(id string) (*Role, error) {
 	if r, ok := m.Roles[id]; !ok {
-		return nil, errors.WithStack(pkg.ErrNotFound)
+		return nil, errors.WithStack(&herodot.ErrorNotFound)
 	} else {
 		return &r, nil
 	}

diff --git a/role/manager_sql.go b/role/manager_sql.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 
 	"github.com/jmoiron/sqlx"
-	"github.com/ory/hydra/pkg"
+	"github.com/ory/herodot"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 	"github.com/rubenv/sql-migrate"
@@ -102,7 +102,7 @@ func (m *SQLManager) GetRole(id string) (*Role, error) {
 
 	var q []string
 	if err := m.DB.Select(&q, m.DB.Rebind(fmt.Sprintf("SELECT member from %s WHERE role_id = ?", m.TableMember)), found); err == sql.ErrNoRows {
-		return nil, errors.WithStack(pkg.ErrNotFound)
+		return nil, errors.WithStack(&herodot.ErrorNotFound)
 	} else if err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -164,7 +164,7 @@ func (m *SQLManager) RemoveRoleMembers(role string, subjects []string) error {
 func (m *SQLManager) FindRolesByMember(member string, limit, offset int) ([]Role, error) {
 	var ids []string
 	if err := m.DB.Select(&ids, m.DB.Rebind(fmt.Sprintf("SELECT role_id from %s WHERE member = ? GROUP BY role_id ORDER BY role_id LIMIT ? OFFSET ?", m.TableMember)), member, limit, offset); err == sql.ErrNoRows {
-		return nil, errors.WithStack(pkg.ErrNotFound)
+		return nil, errors.WithStack(&herodot.ErrorNotFound)
 	} else if err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -185,7 +185,7 @@ func (m *SQLManager) FindRolesByMember(member string, limit, offset int) ([]Role
 func (m *SQLManager) ListRoles(limit, offset int) ([]Role, error) {
 	var ids []string
 	if err := m.DB.Select(&ids, m.DB.Rebind(fmt.Sprintf("SELECT id from %s LIMIT ? OFFSET ?", m.TableRole)), limit, offset); err == sql.ErrNoRows {
-		return nil, errors.WithStack(pkg.ErrNotFound)
+		return nil, errors.WithStack(&herodot.ErrorNotFound)
 	} else if err != nil {
 		return nil, errors.WithStack(err)
 	}