test: add initial e2e test

.circleci/config.yml

@@ -16,9 +16,10 @@ jobs:
         image: circleci/golang:1.15
         environment:
           TEST_DATABASE_POSTGRESQL: postgres://test:test@localhost:5432/keto?sslmode=disable
-          TEST_DATABASE_MYSQL: root:test@(localhost:3306)/mysql?parseTime=true
+          TEST_DATABASE_MYSQL: mysql://root:test@(localhost:3306)/mysql?parseTime=true&multiStatements=true
+          TEST_DATABASE_COCKROACHDB: cockroach://root@localhost:26257/defaultdb?sslmode=disable
       -
-        image: postgres:9.5
+        image: postgres:11.8
         environment:
           POSTGRES_USER: test
           POSTGRES_PASSWORD: test
@@ -27,6 +28,9 @@ jobs:
         image: mysql:8.0
         environment:
           MYSQL_ROOT_PASSWORD: test
+      -
+        image: cockroachdb/cockroach:v20.1.0
+        command: start --insecure
     working_directory: /go/src/github.com/ory/keto
     steps:
       - checkout
@@ -41,7 +45,7 @@ jobs:
 
       # Tests
       -
-        run: go test -tags sqlite -race -short -v $(go list ./... | grep -v cmd)
+        run: go test -tags sqlite -race -short -v ./...
       -
         run: go-acc -o coverage.txt ./... -- -v -tags sqlite
 

.schema/config.schema.json

@@ -197,35 +197,62 @@
     },
     "serve": {
       "type": "object",
-      "title": "HTTP REST API",
       "additionalProperties": false,
       "properties": {
-        "port": {
-          "type": "integer",
-          "default": 4456,
-          "title": "Port",
-          "description": "The port to listen on.",
-          "minimum": 1,
-          "maximum": 65535,
-          "examples": [
-            4456
-          ]
-        },
-        "host": {
-          "type": "string",
-          "default": "",
-          "examples": [
-            "localhost",
-            "127.0.0.1"
-          ],
-          "title": "Host",
-          "description": "The network interface to listen on."
-        },
-        "cors": {
-          "$ref": "#/definitions/cors"
+        "rest": {
+          "type": "object",
+          "title": "HTTP REST API",
+          "additionalProperties": false,
+          "properties": {
+            "port": {
+              "type": "integer",
+              "default": 4466,
+              "title": "Port",
+              "description": "The port to listen on.",
+              "minimum": 1,
+              "maximum": 65535
+            },
+            "host": {
+              "type": "string",
+              "default": "",
+              "examples": [
+                "localhost",
+                "127.0.0.1"
+              ],
+              "title": "Host",
+              "description": "The network interface to listen on."
+            },
+            "cors": {
+              "$ref": "#/definitions/cors"
+            },
+            "tls": {
+              "$ref": "#/definitions/tlsx"
+            }
+          }
         },
-        "tls": {
-          "$ref": "#/definitions/tlsx"
+        "grpc": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "port": {
+              "type": "integer",
+              "default": 4467,
+              "title": "Port",
+              "description": "The port to listen on.",
+              "minimum": 1,
+              "maximum": 65535
+            },
+            "host": {
+              "type": "string",
+              "default": "",
+              "examples": [
+                "localhost",
+                "127.0.0.1"
+              ],
+              "title": "Host",
+              "description": "The network interface to listen on."
+            }
+          }
         }
       }
     },

Makefile

@@ -94,3 +94,11 @@ buf-lint: deps
 #
 .PHONY: buf
 buf: buf-lint buf-gen
+
+.PHONY: reset-testdb
+reset-testdb:
+		source scripts/test-resetdb.sh
+
+.PHONY: test-e2e
+test-e2e:
+		go test -tags sqlite -failfast -v ./internal/e2e

cmd/migrate/down.go

@@ -0,0 +1,40 @@
+package migrate
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/ory/x/cmdx"
+	"github.com/spf13/cobra"
+
+	"github.com/ory/keto/internal/driver"
+)
+
+func newDownCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:  "down <steps>",
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+
+			steps, err := strconv.ParseInt(args[0], 0, 0)
+			if err != nil {
+				// return this error so it gets printed along the usage
+				return fmt.Errorf("malformed argument %s for <steps>: %+v", args[0], err)
+			}
+
+			reg, err := driver.NewDefaultRegistry(ctx, cmd.Flags())
+			if err != nil {
+				return err
+			}
+			if err := reg.Migrator().MigrateDown(ctx, int(steps)); err != nil {
+				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Could apply down migrations: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			return nil
+		},
+	}
+
+	return cmd
+}

cmd/migrate/root.go

@@ -2,12 +2,20 @@ package migrate
 
 import "github.com/spf13/cobra"
 
-var migrateCmd = &cobra.Command{
-	Use: "migrate",
+func newMigrateCmd() *cobra.Command {
+	return &cobra.Command{
+		Use: "migrate",
+	}
 }
 
-func RegisterCommandRecursive(parent *cobra.Command) {
-	migrateCmd.AddCommand(newStatusCmd(), newUpCmd())
+func RegisterCommandsRecursive(parent *cobra.Command) {
+	migrateCmd := newMigrateCmd()
+
+	migrateCmd.AddCommand(
+		newStatusCmd(),
+		newUpCmd(),
+		newDownCmd(),
+	)
 
 	parent.AddCommand(migrateCmd)
 }

cmd/migrate/status.go

@@ -1,11 +1,9 @@
 package migrate
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/ory/x/cmdx"
-	"github.com/ory/x/logrusx"
 	"github.com/spf13/cobra"
 
 	"github.com/ory/keto/internal/driver"
@@ -15,10 +13,12 @@ func newStatusCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "status",
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
+			ctx := cmd.Context()
 
-			reg := driver.NewDefaultRegistry(ctx, logrusx.New("keto", "test"), cmd.Flags(), "test", "adf", "today")
+			reg, err := driver.NewDefaultRegistry(ctx, cmd.Flags())
+			if err != nil {
+				return err
+			}
 			if err := reg.Migrator().MigrationStatus(ctx, cmd.OutOrStdout()); err != nil {
 				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not get migration status: %+v\n", err)
 				return cmdx.FailSilently(cmd)

cmd/migrate/up.go

@@ -1,30 +1,46 @@
 package migrate
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/ory/x/cmdx"
-	"github.com/ory/x/logrusx"
+	"github.com/ory/x/flagx"
 	"github.com/spf13/cobra"
 
 	"github.com/ory/keto/internal/driver"
 )
 
+const FlagYes = "yes"
+
 func newUpCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "up",
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
+			ctx := cmd.Context()
+
+			reg, err := driver.NewDefaultRegistry(ctx, cmd.Flags())
+			if err != nil {
+				return err
+			}
+			if err := reg.Migrator().MigrationStatus(ctx, cmd.OutOrStdout()); err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not get migration status: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			if !flagx.MustGetBool(cmd, FlagYes) && !cmdx.AskForConfirmation("Do you want to apply above planned migrations?", cmd.InOrStdin(), cmd.OutOrStdout()) {
+				_, _ = fmt.Fprintln(cmd.OutOrStdout(), "Aborting")
+				return nil
+			}
 
-			reg := driver.NewDefaultRegistry(ctx, logrusx.New("keto", "test"), cmd.Flags(), "test", "adf", "today")
 			if err := reg.Migrator().MigrateUp(ctx); err != nil {
 				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not apply migrations: %+v\n", err)
 				return cmdx.FailSilently(cmd)
 			}
 			return nil
 		},
 	}
+
+	cmd.Flags().BoolP(FlagYes, "y", false, "yes to all questions, no user input required")
+
 	return cmd
 }

cmd/namespace/migrate_down.go

@@ -0,0 +1,50 @@
+package namespace
+
+import (
+	"fmt"
+
+	"github.com/ory/x/cmdx"
+	"github.com/spf13/cobra"
+
+	"github.com/ory/keto/internal/driver"
+)
+
+func NewMigrateDownCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "down <namespace-name> <steps>",
+		Short: "Migrate a namespace down.",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+
+			reg, err := driver.NewDefaultRegistry(ctx, cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			nm, err := reg.Config().NamespaceManager()
+			if err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not initialize the namespace manager: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			n, err := nm.GetNamespace(ctx, args[0])
+			if err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not find the namespace with name \"%s\": %+v\n", args[0], err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			if err := reg.NamespaceMigrator().MigrateNamespaceDown(ctx, n, 0); err != nil {
+				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Could not apply namespace migration: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			return nil
+		},
+	}
+
+	registerYesFlag(cmd.Flags())
+	registerPackageFlags(cmd.Flags())
+
+	return cmd
+}

cmd/namespace/migrate.go → cmd/namespace/migrate_up.go

@@ -1,36 +1,43 @@
 package namespace
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/flagx"
-	"github.com/ory/x/logrusx"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
 	"github.com/ory/keto/internal/driver"
 	"github.com/ory/keto/internal/persistence"
 )
 
-func NewMigrateCmd() *cobra.Command {
+func NewMigrateUpCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "migrate <namespaces.yml>",
+		Use:   "up <namespace-name>",
 		Short: "Migrate a namespace up.",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
+			ctx := cmd.Context()
 
-			reg := driver.NewDefaultRegistry(ctx, logrusx.New("keto", "master"), cmd.Flags(), "master", "local", "today")
-
-			n, err := validateNamespaceFile(cmd, args[0])
+			reg, err := driver.NewDefaultRegistry(ctx, cmd.Flags())
 			if err != nil {
 				return err
 			}
 
+			nm, err := reg.Config().NamespaceManager()
+			if err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not initialize the namespace manager: %+v\n", err)
+				return cmdx.FailSilently(cmd)
+			}
+
+			n, err := nm.GetNamespace(ctx, args[0])
+			if err != nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Could not find the namespace with name \"%s\": %+v\n", args[0], err)
+				return cmdx.FailSilently(cmd)
+			}
+
 			status, err := reg.NamespaceMigrator().NamespaceStatus(ctx, n.ID)
 			if err != nil {
 				if !errors.Is(err, persistence.ErrNamespaceUnknown) {