[FAB-7728] Check for error in fabsdk option

Change-Id: Id628c689a9b4e11e7ef8c435745265dc8c3b7c4e
Signed-off-by: Troy Ronda <troy@troyronda.com>

pkg/fabsdk/fabsdk.go

@@ -125,7 +125,10 @@ func New(options ...SDKOption) (*FabricSDK, error) {
 	}
 
 	for _, option := range options {
-		option(&sdk)
+		_, err := option(&sdk)
+		if err != nil {
+			return nil, errors.WithMessage(err, "Error in option passed to New")
+		}
 	}
 
 	// Initialize logging provider with default logging provider (if needed)

pkg/fabsdk/fabsdk_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/def/factory/defclient"
 	"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
 	"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
+	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
 	apisdk "github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging/deflogger"
 )
@@ -28,6 +29,31 @@ func defPkgSuite() SDKOption {
 	return PkgSuiteAsOpt(pkgSuite)
 }
 
+func TestNewGoodOpt(t *testing.T) {
+	_, err := New(ConfigFile("../../test/fixtures/config/config_test.yaml"), goodOpt(), defPkgSuite())
+	if err != nil {
+		t.Fatalf("Expected no error from New, but got %v", err)
+	}
+}
+
+func goodOpt() SDKOption {
+	return func(sdk *FabricSDK) (*FabricSDK, error) {
+		return sdk, nil
+	}
+}
+
+func TestNewBadOpt(t *testing.T) {
+	_, err := New(ConfigFile("../../test/fixtures/config/config_test.yaml"), badOpt(), defPkgSuite())
+	if err == nil {
+		t.Fatalf("Expected error from New")
+	}
+}
+
+func badOpt() SDKOption {
+	return func(sdk *FabricSDK) (*FabricSDK, error) {
+		return sdk, errors.New("Bad Opt")
+	}
+}
 func TestNewDefaultSDK(t *testing.T) {
 	// Test new SDK with invalid config file
 	_, err := New(ConfigFile("../../test/fixtures/config/invalid.yaml"), StateStorePath("/tmp/state"), defPkgSuite())