all: move move ory-am/ladon to ory/ladon

guoyu07 · May 7, 2017 · e02b017 · e02b017
1 parent 708c1a2
commit e02b017
Show file tree

Hide file tree

Showing 25 changed files with 70 additions and 294 deletions.
diff --git a/client/handler.go b/client/handler.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ory-am/common/rand/sequence"
 	"github.com/ory-am/hydra/firewall"
 	"github.com/ory/herodot"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pkg/errors"
 )
 

diff --git a/client/manager_test.go b/client/manager_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ory/herodot"
 	"github.com/ory-am/hydra/integration"
 	"github.com/ory-am/hydra/pkg"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/cmd/cli/handler_policy.go b/cmd/cli/handler_policy.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/hydra/policy"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/spf13/cobra"
 	"github.com/square/go-jose/json"
 )

diff --git a/cmd/server/handler.go b/cmd/server/handler.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ory-am/hydra/policy"
 	"github.com/ory-am/hydra/warden"
 	"github.com/ory-am/hydra/warden/group"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/urfave/negroni"

diff --git a/cmd/server/helper_client.go b/cmd/server/helper_client.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ory-am/hydra/client"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/pkg"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 )
 
 func (h *Handler) createRootIfNewInstall(c *config.Config) {

diff --git a/compose/firewall.go b/compose/firewall.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/hydra/warden"
 	"github.com/ory-am/hydra/warden/group"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"golang.org/x/oauth2"
 )
 

diff --git a/config/config.go b/config/config.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ory-am/fosite/token/hmac"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/hydra/warden/group"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

diff --git a/config/context.go b/config/context.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ory-am/hydra/jwk"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/hydra/warden/group"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/Sirupsen/logrus"
 )
 

diff --git a/docs/access-control.md b/docs/access-control.md
@@ -1,7 +1,7 @@
 # Access Control Policies
 
 Besides OAuth2 Token Introspection, Hydra offers Access Control Policies using
-the [Ladon](https://github.com/ory-am/ladon) framework. Access Control Policies are used by Hydra internally and exposed
+the [Ladon](https://github.com/ory/ladon) framework. Access Control Policies are used by Hydra internally and exposed
 via various HTTP APIs.
 
 ## Introduction to Access Control Policies

diff --git a/docs/access-control/policies.md b/docs/access-control/policies.md
@@ -1,7 +1,7 @@
 # Access Control Policies
 
-Hydra uses the Access Control Library [Ladon](https://github.com/ory-am/ladon).
-For a deep dive, it is a good idea to read the [Ladon Docs](https://github.com/ory-am/ladon#ladon).
+Hydra uses the Access Control Library [Ladon](https://github.com/ory/ladon).
+For a deep dive, it is a good idea to read the [Ladon Docs](https://github.com/ory/ladon#ladon).
 
 In Hydra, policy based access control is when you decide if:
 

diff --git a/docs/faq/security.md b/docs/faq/security.md
@@ -29,7 +29,7 @@ best practices proposed by the IETF:
      and a global secret. This is what a token can look like: `/tgBeUhWlAT8tM8Bhmnx+Amf8rOYOUhrDi3pGzmjP7c=.BiV/Yhma+5moTP46anxMT6cWW8gz5R5vpC9RbpwSDdM=`
 * **Enforcing scopes:** By default, you always need to include the `core` scope or Hydra will not execute the request.
 
-Hydra uses [Ladon](https://github.com/ory-am/ladon) for policy management and access control. Ladon's API is minimalistic
+Hydra uses [Ladon](https://github.com/ory/ladon) for policy management and access control. Ladon's API is minimalistic
 and well tested.
 
 Hydra encrypts symmetric and asymmetric keys at rest using AES-GCM 256bit.

diff --git a/docs/sdk/go.md b/docs/sdk/go.md
@@ -37,7 +37,7 @@ var clients, err = hydra.Client.GetClients()
 
 Manage policies using [`ory-am/hydra/policy.HTTPManager`](policy/manager_http.go):
 ```go
-import "github.com/ory-am/ladon"
+import "github.com/ory/ladon"
 
 // Create a new policy
 // allow user to view his/her own photos

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -32,8 +32,8 @@ import:
   - storage
   - token/hmac
   - token/jwt
-- package: github.com/ory-am/ladon
-  version: v0.5.0
+- package: github.com/ory/ladon
+  version: v0.6.0
 - package: github.com/pborman/uuid
   version: v1.0
 - package: github.com/pkg/errors

diff --git a/integration/sql_schema_test.go b/integration/sql_schema_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ory-am/hydra/oauth2"
 	"github.com/ory-am/hydra/policy"
 	"github.com/ory-am/hydra/warden/group"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/stretchr/testify/require"
 	"testing"
 )

diff --git a/jwk/manager_test.go b/jwk/manager_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ory-am/hydra/integration"
 	. "github.com/ory-am/hydra/jwk"
 	"github.com/ory-am/hydra/pkg"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pkg/errors"
 	"github.com/square/go-jose"
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/test_helpers.go b/pkg/test_helpers.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ory-am/fosite/handler/oauth2"
 	"github.com/ory-am/fosite/storage"
 	"github.com/ory-am/fosite/token/hmac"
-	"github.com/ory-am/ladon"
+	"github.com/ory/ladon"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"