chore: cleanup repo (#268)

.circleci/config.yml

@@ -5,9 +5,9 @@ orbs:
   changelog: ory/[email protected]
   goreleaser: ory/[email protected]
   slack: circleci/[email protected]
-  nancy: ory/[email protected].10
-  docs: ory/[email protected].4
-  golangci: ory/[email protected].4
+  nancy: ory/[email protected].12
+  docs: ory/[email protected].8
+  golangci: ory/[email protected].9
 
 jobs:
   test:
@@ -44,12 +44,20 @@ jobs:
         run: go test -race -short -v $(go list ./... | grep -v cmd)
       -
         run: go-acc -v -o coverage.txt ./...
-      -
-        run: ./scripts/test-e2e.sh
 
       # Submit coverage details
       -
         run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
+  validate:
+    docker:
+      - image: circleci/golang:1.15-node
+        environment:
+          GO111MODULE: 'on'
+    working_directory: /go/src/github.com/ory/keto
+    steps:
+      - checkout
+      - golangci/lint
+      - docs/check-format
 
 workflows:
   version: 2
@@ -61,7 +69,7 @@ workflows:
             tags:
               only: /.*/
       -
-        golangci/lint:
+        validate:
           filters:
             tags:
               only: /.*/
@@ -74,7 +82,7 @@ workflows:
         changelog/generate:
           requires:
             - test
-            - golangci/lint
+            - validate
           filters:
             tags:
               only: /.*/
@@ -84,7 +92,7 @@ workflows:
         docs/build:
           requires:
             - test
-            - golangci/lint
+            - validate
           filters:
             tags:
               only: /.*/
@@ -95,12 +103,12 @@ workflows:
           appname: Ory_Keto
           requires:
             - test
-            - golangci/lint
+            - validate
       -
         sdk/release:
           requires:
             - test
-            - golangci/lint
+            - validate
             - goreleaser/release
           filters:
             tags:
@@ -117,7 +125,7 @@ workflows:
           requires:
             - goreleaser/test
             - test
-            - golangci/lint
+            - validate
           filters:
             branches:
               ignore: /.*/

cmd/client/helper.go

@@ -31,9 +31,6 @@ import (
 
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/flagx"
-	"github.com/ory/x/stringslice"
-
-	"github.com/ory/keto/engine/ladon"
 )
 
 var hc = http.DefaultClient
@@ -82,12 +79,6 @@ func Delete(location string) {
 	fmt.Printf("Resource at location %s was deleted successfully!", location)
 }
 
-func CheckLadonFlavor(flavor string) {
-	if !stringslice.Has(ladon.EnabledFlavors, flavor) {
-		cmdx.Fatalf("ORY Access Control Policy flavor %s is currently not supported, please choose one of: %v", flavor, ladon.EnabledFlavors)
-	}
-}
-
 func EndpointURL(cmd *cobra.Command) string {
 	e := flagx.MustGetString(cmd, "endpoint")
 	if e == "" {