sdk: Improve naming for ory policies (#100)

Signed-off-by: aeneasr <[email protected]>

cmd/engines_acp_ory_allowed.go

@@ -38,7 +38,7 @@ var enginesAcpOryAllowedCmd = &cobra.Command{
 		res, err := c.Engines.DoOryAccessControlPoliciesAllow(
 			engines.NewDoOryAccessControlPoliciesAllowParams().
 				WithFlavor(args[0]).
-				WithBody(&models.Input{
+				WithBody(&models.OryAccessControlPolicyAllowedInput{
 					Subject:  args[1],
 					Resource: args[2],
 					Action:   args[3],

engine/ladon/handler_helper_test.go

@@ -28,12 +28,12 @@ var (
 		}},
 	}
 	requests = map[string][]struct {
-		req     models.Input
+		req     models.OryAccessControlPolicyAllowedInput
 		allowed bool
 	}{
 		"regex": {
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "other-thing",
 					Action:   "create",
@@ -42,7 +42,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "matrix",
 					Action:   "delete",
@@ -51,7 +51,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "matrix",
 					Action:   "create",
@@ -60,7 +60,7 @@ var (
 				allowed: true,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "ken",
 					Resource: "forbidden_matrix",
 					Action:   "create",
@@ -69,7 +69,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "ken",
 					Resource: "allowed_matrix",
 					Action:   "create",
@@ -80,7 +80,7 @@ var (
 		},
 		"exact": {
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "other-thing",
 					Action:   "create",
@@ -89,7 +89,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "matrix",
 					Action:   "delete",
@@ -98,7 +98,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "alice",
 					Resource: "matrix",
 					Action:   "create",
@@ -107,7 +107,7 @@ var (
 				allowed: true,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "ken",
 					Resource: "forbidden_matrix",
 					Action:   "create",
@@ -116,7 +116,7 @@ var (
 				allowed: false,
 			},
 			{
-				req: models.Input{
+				req: models.OryAccessControlPolicyAllowedInput{
 					Subject:  "ken",
 					Resource: "allowed_matrix",
 					Action:   "create",

engine/ladon/types.go

@@ -9,7 +9,7 @@ const (
 
 // Input for checking if a request is allowed or not.
 //
-// swagger:model oryAccessControlPolicyAllowedInput
+// swagger:ignore
 type Input struct {
 	// Resource is the resource that access is requested to.
 	Resource string `json:"resource"`

go.sum

@@ -531,8 +531,6 @@ github.com/ory/herodot v0.6.0 h1:Dcs4yH1Qw1GIgGCvvvdafhT8xjwElTE//8xLmHtPEYA=
 github.com/ory/herodot v0.6.0/go.mod h1:3BOneqcyBsVybCPAJoi92KN2BpJHcmDqAMcAAaJiJow=
 github.com/ory/sqlcon v0.0.7 h1:PQl4ihs11Xzw9wyFk0YQmQEnPL0icdJjiStQNaoRTmM=
 github.com/ory/sqlcon v0.0.7/go.mod h1:oOyCmOJWAs8F0bnGmmIvGA9/4K1JqVL0D9JgvAaVc3U=
-github.com/ory/x v0.0.41 h1:wcvrT82ktnAkioDvEsnJEroTvjzJ8yHDgt8gfLEGqZM=
-github.com/ory/x v0.0.41/go.mod h1:wY34Yfy/lRklrrVbChZHqOQxhbSHH2a6bSJ6o3YFKY8=
 github.com/ory/x v0.0.42 h1:5buEAEuI7TAq6WsZM8K4LIBllFhwpwMDlSBaPd2RiN0=
 github.com/ory/x v0.0.42/go.mod h1:wY34Yfy/lRklrrVbChZHqOQxhbSHH2a6bSJ6o3YFKY8=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
@@ -662,6 +660,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/toqueteos/webbrowser v1.1.0 h1:Prj1okiysRgHPoe3B1bOIVxcv+UuSt525BDQmR5W0x0=
 github.com/toqueteos/webbrowser v1.1.0/go.mod h1:Hqqqmzj8AHn+VlZyVjaRWY20i25hoOZGAABCcg2el4A=
+github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
 github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
 github.com/uber/jaeger-client-go v2.15.0+incompatible h1:NP3qsSqNxh8VYr956ur1N/1C1PjvOJnJykCzcD5QHbk=
 github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
@@ -686,6 +685,7 @@ go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A=
 go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M=
 go.opencensus.io v0.20.0 h1:L/ARO58pdktB6dLmYI0zAyW1XnavEmGziFd0MKfxnck=
 go.opencensus.io v0.20.0/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M=
+go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=