IWF-125: Limit error size return from API

service/interpreter/activityImpl.go

@@ -180,16 +180,29 @@ func composeHttpError(
 		maxL := len(errMsg)
 		if maxL > 5 {
 			maxL = 5
+			errMsg = errMsg[:maxL] + "..."
 		}
-		errMsg = errMsg[:maxL] + "..."
 
 		maxL = len(responseBody)
 		if maxL > 50 {
 			maxL = 50
+			responseBody = responseBody[:maxL] + "..."
 		}
-		responseBody = responseBody[:maxL] + "..."
 		errType = "1st-attempt-failure"
+	} else {
+		maxL := len(errMsg)
+		if maxL > 50 {
+			maxL = 50
+			errMsg = errMsg[:maxL] + "..."
+		}
+
+		maxL = len(responseBody)
+		if maxL > 500 {
+			maxL = 500
+			responseBody = responseBody[:maxL] + "..."
+		}
 	}
+
 	return provider.NewApplicationError(errType,
 		fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", statusCode, responseBody, errMsg))
 }

service/interpreter/activityImpl_test.go

@@ -1,9 +1,15 @@
 package interpreter
 
 import (
+	"errors"
+	"fmt"
+	"github.com/golang/mock/gomock"
 	"github.com/indeedeng/iwf/gen/iwfidl"
 	"github.com/indeedeng/iwf/service/common/ptr"
 	"github.com/stretchr/testify/assert"
+	"io"
+	"net/http"
+	"strings"
 	"testing"
 	"time"
 )
@@ -88,3 +94,141 @@ func createCommands() ([]iwfidl.TimerCommand, []iwfidl.SignalCommand, []iwfidl.I
 	}
 	return validTimerCommands, validSignalCommands, internalCommands
 }
+
+func TestComposeHttpError_LocalActivity_LongErrorResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	longError := strings.Repeat("a", 1000)
+
+	httpResp := &http.Response{
+		StatusCode: 400,
+		Body:       io.NopCloser(strings.NewReader(longError)),
+	}
+	errMsg := "original error message"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("1st-attempt-failure", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", httpResp.StatusCode, longError[:50]+"...", errors.New(errMsg[:5]+"..."))).Return(returnedError)
+
+	err = composeHttpError(true, mockActivityProvider, err, httpResp, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}
+
+func TestComposeHttpError_RegularActivity_LongErrorResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	longError := strings.Repeat("a", 1000)
+
+	httpResp := &http.Response{
+		StatusCode: 400,
+		Body:       io.NopCloser(strings.NewReader(longError)),
+	}
+	errMsg := "original error message which is very long like this"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("test-error-type", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", httpResp.StatusCode, longError[:500]+"...", errors.New(errMsg[:50]+"..."))).Return(returnedError)
+
+	err = composeHttpError(false, mockActivityProvider, err, httpResp, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}
+
+func TestComposeHttpError_LocalActivity_ShortErrorResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	shortError := strings.Repeat("a", 40)
+
+	httpResp := &http.Response{
+		StatusCode: 400,
+		Body:       io.NopCloser(strings.NewReader(shortError)),
+	}
+	errMsg := "OK"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("1st-attempt-failure", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", httpResp.StatusCode, shortError, errors.New(errMsg))).Return(returnedError)
+
+	err = composeHttpError(true, mockActivityProvider, err, httpResp, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}
+
+func TestComposeHttpError_RegularActivity_ShortErrorResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	shortError := strings.Repeat("a", 40)
+
+	httpResp := &http.Response{
+		StatusCode: 400,
+		Body:       io.NopCloser(strings.NewReader(shortError)),
+	}
+	errMsg := "OK"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("test-error-type", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", httpResp.StatusCode, shortError, errors.New(errMsg))).Return(returnedError)
+
+	err = composeHttpError(false, mockActivityProvider, err, httpResp, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}
+
+func TestComposeHttpError_LocalActivity_NilResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	errMsg := "OK"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("1st-attempt-failure", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", 0, "None", errors.New(errMsg))).Return(returnedError)
+
+	err = composeHttpError(true, mockActivityProvider, err, nil, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}
+
+func TestComposeHttpError_RegularActivity_NilResponse(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockActivityProvider := NewMockActivityProvider(ctrl)
+
+	errMsg := "OK"
+	err := errors.New(errMsg)
+
+	returnedError := errors.New("test error msg")
+	mockActivityProvider.EXPECT().NewApplicationError("test-error-type", fmt.Sprintf("statusCode: %v, responseBody: %v, errMsg: %v", 0, "None", errors.New(errMsg))).Return(returnedError)
+
+	err = composeHttpError(false, mockActivityProvider, err, nil, "test-error-type")
+	if err != nil {
+		return
+	}
+
+	assert.Error(t, err)
+	assert.Equal(t, returnedError, err)
+}