fix: Improve json detection

Author: jachym-tousek-keboola

internal/pkg/service/stream/mapping/recordctx/utils.go

@@ -1,37 +1,27 @@
 package recordctx
 
 import (
-	"strings"
-
 	jsoniter "github.com/json-iterator/go"
 	"github.com/keboola/go-utils/pkg/orderedmap"
-	"github.com/umisama/go-regexpcache"
 
 	serviceError "github.com/keboola/keboola-as-code/internal/pkg/service/common/errors"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/errors"
+	"github.com/keboola/keboola-as-code/internal/pkg/utils/httputils"
 	utilsUrl "github.com/keboola/keboola-as-code/internal/pkg/utils/url"
 )
 
 // json - replacement of the standard encoding/json library, it is faster for larger responses.
 var json = jsoniter.ConfigCompatibleWithStandardLibrary //nolint:gochecknoglobals
 
-func isContentTypeJSON(t string) bool {
-	return regexpcache.MustCompile(`^application/([a-zA-Z0-9\.\-]+\+)?json$`).MatchString(t)
-}
-
-func isContentTypeForm(t string) bool {
-	return strings.HasPrefix(t, "application/x-www-form-urlencoded")
-}
-
 func parseBody(contentType string, body []byte) (data *orderedmap.OrderedMap, err error) {
 	// Decode
 	switch {
-	case isContentTypeForm(contentType):
+	case httputils.IsContentTypeForm(contentType):
 		data, err = utilsUrl.ParseQuery(string(body))
 		if err != nil {
 			return nil, serviceError.NewBadRequestError(errors.Errorf("invalid form data: %w", err))
 		}
-	case isContentTypeJSON(contentType):
+	case httputils.IsContentTypeJSON(contentType):
 		err = json.Unmarshal(body, &data)
 		if err != nil {
 			return nil, serviceError.NewBadRequestError(errors.Errorf("invalid JSON: %w", err))

internal/pkg/service/stream/mapping/table/column/renderer.go

@@ -14,6 +14,7 @@ import (
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/mapping/jsonnet"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/mapping/recordctx"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/errors"
+	"github.com/keboola/keboola-as-code/internal/pkg/utils/httputils"
 )
 
 type Renderer struct {
@@ -47,9 +48,9 @@ func (r *Renderer) CSVValue(c Column, ctx recordctx.Context) (string, error) {
 	case IP:
 		return ctx.ClientIP().String(), nil
 	case Path:
-		contentType := ctx.HeadersMap().GetOrNil("Content-Type")
+		contentType, ok := ctx.HeadersMap().GetOrNil("Content-Type").(string)
 
-		if contentType == "application/json" {
+		if ok && httputils.IsContentTypeJSON(contentType) {
 			return r.jsonPathCSVValue(c, ctx)
 		}
 

internal/pkg/utils/httputils/httputils.go

@@ -0,0 +1,15 @@
+package httputils
+
+import (
+	"strings"
+
+	"github.com/umisama/go-regexpcache"
+)
+
+func IsContentTypeJSON(t string) bool {
+	return regexpcache.MustCompile(`^application/([a-zA-Z0-9\.\-]+\+)?json$`).MatchString(t)
+}
+
+func IsContentTypeForm(t string) bool {
+	return strings.HasPrefix(t, "application/x-www-form-urlencoded")
+}