move function

block · Oct 4, 2024 · 42d62bf · 42d62bf
1 parent 96e9f11
commit 42d62bf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/backend/controller/controller.go b/backend/controller/controller.go
@@ -1032,7 +1032,7 @@ func (s *Service) callWithRequest(
 		return nil, connect.NewError(connect.CodePermissionDenied, fmt.Errorf("verb %q is not exported", verbRef))
 	}
 
-	err = ingress.ValidateCallBody(req.Msg.Body, verb, sch)
+	err = validateCallBody(req.Msg.Body, verb, sch)
 	if err != nil {
 		observability.Calls.Request(ctx, req.Msg.Verb, start, optional.Some("invalid request: invalid call body"))
 		return nil, err
@@ -1906,6 +1906,24 @@ func makeBackoff(min, max time.Duration) backoff.Backoff {
 	}
 }
 
+func validateCallBody(body []byte, verb *schema.Verb, sch *schema.Schema) error {
+	var root any
+	err := json.Unmarshal(body, &root)
+	if err != nil {
+		return fmt.Errorf("request body is not valid JSON: %w", err)
+	}
+
+	var opts []schema.EncodingOption
+	if e, ok := slices.FindVariant[*schema.MetadataEncoding](verb.Metadata); ok && e.Lenient {
+		opts = append(opts, schema.LenientMode())
+	}
+	err = schema.ValidateJSONValue(verb.Request, []string{verb.Request.String()}, root, sch, opts...)
+	if err != nil {
+		return fmt.Errorf("could not validate HTTP request body: %w", err)
+	}
+	return nil
+}
+
 type Route struct {
 	Module     string
 	Deployment model.DeploymentKey

diff --git a/backend/controller/ingress/ingress.go b/backend/controller/ingress/ingress.go
@@ -1,7 +1,6 @@
 package ingress
 
 import (
-	"encoding/json"
 	"fmt"
 	"math/rand"
 	"strings"
@@ -49,24 +48,6 @@ func matchSegments(pattern, urlPath string, onMatch func(segment, value string))
 	return true
 }
 
-func ValidateCallBody(body []byte, verb *schema.Verb, sch *schema.Schema) error {
-	var root any
-	err := json.Unmarshal(body, &root)
-	if err != nil {
-		return fmt.Errorf("request body is not valid JSON: %w", err)
-	}
-
-	var opts []schema.EncodingOption
-	if e, ok := slices.FindVariant[*schema.MetadataEncoding](verb.Metadata); ok && e.Lenient {
-		opts = append(opts, schema.LenientMode())
-	}
-	err = schema.ValidateJSONValue(verb.Request, []string{verb.Request.String()}, root, sch, opts...)
-	if err != nil {
-		return fmt.Errorf("could not validate HTTP request body: %w", err)
-	}
-	return nil
-}
-
 func getField(name string, ref *schema.Ref, sch *schema.Schema) (*schema.Field, error) {
 	data, err := sch.ResolveMonomorphised(ref)
 	if err != nil {

diff --git a/backend/controller/timeline/timeline_test.go b/backend/controller/timeline/timeline_test.go
@@ -4,14 +4,15 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"github.com/TBD54566975/ftl/backend/controller/artefacts"
 	"io"
 	"net/http"
 	"net/url"
 	"reflect"
 	"testing"
 	"time"
 
+	"github.com/TBD54566975/ftl/backend/controller/artefacts"
+
 	"github.com/alecthomas/assert/v2"
 	"github.com/alecthomas/types/optional"