fix: handle sdk error (#51)

Author: Dav-14

internal/server/sdk/errors.go

@@ -2,25 +2,39 @@ package sdk
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
 
 	"github.com/formancehq/formance-sdk-go/v3/pkg/models/sdkerrors"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"go.opentelemetry.io/otel/trace"
 )
 
+type Error struct {
+	ErrorCode    string `json:"errorCode"`
+	ErrorMessage string `json:"errorMessage"`
+}
+
 func HandleStackError(ctx context.Context, err error, diag *diag.Diagnostics) {
-	sharedError := &sdkerrors.V2ErrorResponse{
+	sharedError := &Error{
 		ErrorCode:    "INTERNAL",
-		ErrorMessage: "unexpected error",
+		ErrorMessage: err.Error(),
 	}
-	switch e := err.(type) {
-	case *sdkerrors.V2ErrorResponse:
-		sharedError = e
+
+	tmp := &sdkerrors.SDKError{}
+	if errors.As(err, &tmp) {
+		err = errors.New(tmp.Body)
+	}
+
+	errResponse := &Error{}
+	if e := json.Unmarshal([]byte(err.Error()), errResponse); e == nil {
+		sharedError = errResponse
 	}
 	span := trace.SpanFromContext(ctx)
 	if span.SpanContext().IsValid() {
-		diag.AddError("traceparent", fmt.Sprintf("%s-%s", span.SpanContext().TraceID(), span.SpanContext().SpanID()))
+		traceparent := fmt.Sprintf("%s-%s", span.SpanContext().TraceID().String(), span.SpanContext().SpanID().String())
+		sharedError.ErrorMessage = fmt.Sprintf("[Traceparent: %s] %s", traceparent, sharedError.ErrorMessage)
 	}
 	diag.AddError(
 		string(sharedError.ErrorCode),

internal/server/sdk/errors_test.go

@@ -0,0 +1,81 @@
+package sdk
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/formancehq/formance-sdk-go/v3/pkg/models/sdkerrors"
+	"github.com/formancehq/formance-sdk-go/v3/pkg/models/shared"
+	"github.com/formancehq/go-libs/v3/pointer"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHandleSDKError(t *testing.T) {
+	for _, tt := range []struct {
+		name     string
+		err      error
+		expected diag.Diagnostic
+	}{
+		{
+			name: "Test case 1",
+			err:  errors.New(""),
+			expected: diag.NewErrorDiagnostic(
+				"INTERNAL",
+				"",
+			),
+		},
+		{
+			name: "Error string",
+			err:  errors.New(`{"errorCode":"VALIDATION","errorMessage":"invalid config: polling period invalid: polling period cannot be lower than minimum of 20m0s: validation error: validation error"}`),
+			expected: diag.NewErrorDiagnostic(
+				"VALIDATION",
+				"invalid config: polling period invalid: polling period cannot be lower than minimum of 20m0s: validation error: validation error",
+			),
+		},
+		{
+			name: "SDKError case",
+			err: &sdkerrors.SDKError{
+				Body: `{"errorCode":"SOME_ERROR","errorMessage":"An error occurred"}`,
+			},
+			expected: diag.NewErrorDiagnostic("SOME_ERROR", "An error occurred"),
+		},
+		{
+			name: "V2ErrorResponse case",
+			err: &sdkerrors.V2ErrorResponse{
+				ErrorCode:    "SOME_ERROR",
+				ErrorMessage: "An error occurred",
+			},
+			expected: diag.NewErrorDiagnostic("SOME_ERROR", "An error occurred"),
+		},
+		{
+			name: "V2BulkResponse case",
+			err: &sdkerrors.V2BulkResponse{
+				ErrorCode:    pointer.For[shared.V2ErrorsEnum]("SOME_ERROR"),
+				ErrorMessage: pointer.For("An error occurred"),
+			},
+			expected: diag.NewErrorDiagnostic("SOME_ERROR", "An error occurred"),
+		},
+		{
+			name: "v3error response case",
+			err: &sdkerrors.ErrorResponse{
+				ErrorMessage: "a message",
+				ErrorCode:    "123",
+			},
+			expected: diag.NewErrorDiagnostic("123", "a message"),
+		},
+		{
+			name:     "invalid error type",
+			err:      errors.New("some random error"),
+			expected: diag.NewErrorDiagnostic("INTERNAL", "some random error"),
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			diag := make(diag.Diagnostics, 0)
+			HandleStackError(context.Background(), tt.err, &diag)
+			require.Len(t, diag, 1)
+			require.Equal(t, tt.expected, diag[0])
+		})
+	}
+}

tests/e2e/payments_connector_test.go

@@ -0,0 +1,62 @@
+package e2e_test
+
+import (
+	"regexp"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
+)
+
+func TestPaymentConnector(t *testing.T) {
+	resource.ParallelTest(t, resource.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"cloud": providerserver.NewProtocol6WithError(CloudProvider()),
+			"stack": providerserver.NewProtocol6WithError(StackProvider()),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(tfversion.Version0_15_0),
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: `
+						provider "stack" {
+							stack_id = cloud_stack.default.id
+							organization_id = data.cloud_current_organization.default.id
+							uri = cloud_stack.default.uri
+						}
+
+						data "cloud_current_organization" "default" {}
+
+						data "cloud_regions" "default" {
+							name = "` + RegionName + `"
+						}
+
+						resource "cloud_stack" "default" {
+							name = "test"
+							region_id = data.cloud_regions.default.id
+							version = "v3.2-rc.1"
+							force_destroy = true
+						}
+
+						resource "stack_payments_connectors" "default" {
+							config = {
+								provider = "Moneycorp"
+								name    = "moneycorp-connector"
+								endpoint = "https://sandbox-corpapi.moneycorp.com"
+								pollingPeriod = "30s"
+							}
+							credentials = {
+								apiKey = "1234"
+								clientID = "formanceApi"
+							}
+						}
+					`,
+				ExpectError: regexp.MustCompile(".*Error: VALIDATION.*"),
+			},
+		},
+	})
+
+}