add Accept and decode response with +json suffix

hasura · Dec 12, 2024 · 66499a3 · 66499a3
1 parent 67ce0d2
commit 66499a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/connector/internal/client.go b/connector/internal/client.go
@@ -373,7 +373,7 @@ func (client *HTTPClient) evalHTTPResponse(ctx context.Context, span trace.Span,
 		}
 
 		result = string(respBody)
-	case contentType == rest.ContentTypeXML:
+	case contentType == rest.ContentTypeXML || strings.HasSuffix(contentType, "+xml"):
 		field, extractErr := client.extractResultType(resultType)
 		if extractErr != nil {
 			return nil, nil, extractErr
@@ -384,7 +384,7 @@ func (client *HTTPClient) evalHTTPResponse(ctx context.Context, span trace.Span,
 		if err != nil {
 			return nil, nil, schema.NewConnectorError(http.StatusInternalServerError, err.Error(), nil)
 		}
-	case contentType == rest.ContentTypeJSON:
+	case contentType == rest.ContentTypeJSON || strings.HasSuffix(contentType, "+json"):
 		if len(resultType) > 0 {
 			namedType, err := resultType.AsNamed()
 			if err == nil && namedType.Name == string(rest.ScalarString) {

diff --git a/connector/internal/request_builder.go b/connector/internal/request_builder.go
@@ -56,6 +56,10 @@ func (c *RequestBuilder) Build() (*RetryableRequest, error) {
 		return nil, err
 	}
 
+	if rawRequest.Response.ContentType != "" && request.Headers.Get(acceptHeader) == "" {
+		request.Headers.Set(acceptHeader, rawRequest.Response.ContentType)
+	}
+
 	if rawRequest.RuntimeSettings != nil {
 		if rawRequest.RuntimeSettings.Timeout > 0 {
 			request.Runtime.Timeout = rawRequest.RuntimeSettings.Timeout

diff --git a/connector/internal/types.go b/connector/internal/types.go
@@ -12,6 +12,7 @@ import (
 )
 
 const (
+	acceptHeader               = "Accept"
 	contentTypeHeader          = "Content-Type"
 	defaultTimeoutSeconds uint = 30
 	defaultRetryDelays    uint = 1000