fix API breakages

.schema/openapi/patches/health.yaml

@@ -73,6 +73,12 @@
                     type: object
                 type: object
           description: Ory Kratos is not yet ready to accept requests.
+        default:
+          content:
+            text/plain:
+              schema:
+                type: string
+          description: Unexpected error
       summary: Check HTTP Server and Database Status
       tags: {{ .HealthPathTags | toJson }}
 - op: replace

.schema/openapi/patches/replacements.sed

@@ -3,6 +3,7 @@ s/ory.keto.relation_tuples.v1alpha2.ErrorResponse.Error/genericError/g
 s/ory.keto.relation_tuples.v1alpha2.CreateRelationTupleRequest.Relationship/createRelationshipBody/g
 s/ory.keto.relation_tuples.v1alpha2.SubjectSet/subjectSet/g
 s/ory.keto.relation_tuples.v1alpha2.SubjectTree/expandedPermissionTree/g
+s/ory.keto.relation_tuples.v1alpha2.RelationTupleDelta/relationshipPatch/g
 s/ory.keto.relation_tuples.v1alpha2.RelationTuple/relationship/g
 s/ory.keto.relation_tuples.v1alpha2.ListRelationTuplesResponse/relationships/g
 s/ory.keto.relation_tuples.v1alpha2.ListNamespacesResponse/relationshipNamespaces/g

internal/driver/daemon.go

@@ -4,7 +4,10 @@
 package driver
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
+	"io"
 	"net/http"
 	"os"
 	"os/signal"
@@ -385,6 +388,24 @@ func (r *RegistryDefault) OPLSyntaxRouter(ctx context.Context, apiHandler http.H
 	}
 	n.UseFunc(semconv.Middleware)
 	n.Use(reqlog.NewMiddlewareFromLogger(r.l, "syntax#Ory Keto").ExcludePaths(healthx.AliveCheckPath, healthx.ReadyCheckPath))
+	n.UseFunc(func(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
+		if r.URL.Path == "/opl/syntax/check" && r.Header.Get("Content-Type") != "application/json" {
+			body, err := io.ReadAll(r.Body)
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusBadRequest)
+				return
+			}
+			newBody, err := json.Marshal(body)
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusBadRequest)
+				return
+			}
+			r.Body = io.NopCloser(bytes.NewReader(newBody))
+			r.ContentLength = int64(len(newBody))
+			r.Header.Set("Content-Type", "application/json")
+		}
+		next(w, r)
+	})
 
 	pr := &x.OPLSyntaxRouter{Router: httprouter.New()}
 	r.PrometheusManager().RegisterRouter(pr.Router)

internal/e2e/rest_client_test.go

@@ -18,9 +18,10 @@ import (
 	"github.com/ory/keto/ketoapi"
 	rts "github.com/ory/keto/proto/ory/keto/relation_tuples/v1alpha2"
 
-	"github.com/ory/herodot"
 	"github.com/tidwall/gjson"
 
+	"github.com/ory/herodot"
+
 	"github.com/ory/keto/internal/x"
 
 	"github.com/stretchr/testify/assert"
@@ -46,9 +47,7 @@ func (rc *restClient) queryNamespaces(t require.TestingT) (res ketoapi.GetNamesp
 }
 
 func (rc *restClient) oplCheckSyntax(t require.TestingT, content []byte) []*ketoapi.ParseError {
-	enc, err := json.Marshal(content)
-	require.NoError(t, err)
-	body, code := rc.makeRequest(t, http.MethodPost, schema.RouteBase, string(enc), rc.oplSyntaxURL)
+	body, code := rc.makeRequest(t, http.MethodPost, schema.RouteBase, string(content), rc.oplSyntaxURL)
 	assert.Equal(t, http.StatusOK, code, body)
 	var response ketoapi.CheckOPLSyntaxResponse
 	require.NoError(t, json.Unmarshal([]byte(body), &response))
@@ -171,8 +170,10 @@ func (rc *restClient) expand(t require.TestingT, r *ketoapi.SubjectSet, depth in
 	return tree
 }
 
-func healthReady(_ require.TestingT, readURL string) bool {
-	resp, err := http.Get(readURL + healthx.ReadyCheckPath)
+func healthReady(t require.TestingT, readURL string) bool {
+	req, err := http.NewRequest("GET", readURL+healthx.ReadyCheckPath, nil)
+	require.NoError(t, err)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return false
 	}

internal/e2e/sdk_client_test.go

@@ -37,15 +37,22 @@ func (c *sdkClient) requestCtx() context.Context {
 }
 
 func (c *sdkClient) oplCheckSyntax(t require.TestingT, content []byte) (parseErrors []*ketoapi.ParseError) {
-	enc, err := json.Marshal(content)
-	require.NoError(t, err)
 	res, _, err := c.getOPLSyntaxClient().
 		RelationshipApi.
 		CheckOplSyntax(c.requestCtx()).
-		Body(string(enc)).
+		Body(string(content)).
 		Execute()
 	require.NoError(t, err)
 
+	//enc, err := json.Marshal(content)
+	//require.NoError(t, err)
+	//res, _, err := c.getOPLSyntaxClient().
+	//	RelationshipApi.
+	//	CheckOplSyntax(c.requestCtx()).
+	//	Body(string(enc)).
+	//	Execute()
+	//require.NoError(t, err)
+
 	raw, err := json.Marshal(res.Errors)
 	require.NoError(t, err)
 	err = json.Unmarshal(raw, &parseErrors)