[FAB-10568] identity config refactoring

- identity config functions to return only
required information.
- separate structs for unmarshalling and for entity returns


Change-Id: I18a2c8cf5c95b65101137d81559ba2d2c7d80c45
Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>

pkg/client/msp/client_test.go

@@ -38,7 +38,7 @@ const (
 var caServerURL string
 
 type nwConfig struct {
-	CertificateAuthorities map[string]msp.CAConfig
+	CertificateAuthorities map[string]mspImpl.CAConfig
 }
 
 // TestMSP is a unit test for Client enrollment and re-enrollment scenarios

pkg/common/providers/msp/provider.go

@@ -8,7 +8,6 @@ package msp
 
 import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
-	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
 	logApi "github.com/hyperledger/fabric-sdk-go/pkg/core/logging/api"
 )
 
@@ -39,7 +38,8 @@ type ClientConfig struct {
 	Organization    string
 	Logging         logApi.LoggingType
 	CryptoConfig    CCType
-	TLSCerts        endpoint.MutualTLSConfig
+	TLSKey          []byte
+	TLSCert         []byte
 	CredentialStore CredentialStoreType
 }
 
@@ -64,10 +64,12 @@ type EnrollCredentials struct {
 
 // CAConfig defines a CA configuration
 type CAConfig struct {
-	URL        string
-	TLSCACerts endpoint.MutualTLSConfig
-	Registrar  EnrollCredentials
-	CAName     string
+	URL              string
+	Registrar        EnrollCredentials
+	CAName           string
+	TLSCAServerCerts [][]byte
+	TLSCAClientCert  []byte
+	TLSCAClientKey   []byte
 }
 
 // Providers represents a provider of MSP service.

pkg/fab/endpointconfig.go

@@ -20,7 +20,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
-	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/msp"
 	commtls "github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm/tls"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/cryptoutil"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
@@ -111,7 +110,18 @@ type entityMatchers struct {
 
 //endpointConfigEntity contains endpoint config elements needed by endpointconfig
 type endpointConfigEntity struct {
-	Client msp.ClientConfig
+	Client clientConfig
+}
+
+// ClientConfig provides the definition of the client configuration
+type clientConfig struct {
+	Organization string
+	TLSCerts     clientTLSConfig
+}
+
+type clientTLSConfig struct {
+	//Client TLS information
+	Client endpoint.TLSKeyPair
 }
 
 // Timeout reads timeouts for the given timeout type, if type is not found in the config
@@ -309,7 +319,7 @@ func (c *EndpointConfig) TLSClientCerts() []tls.Certificate {
 	return c.tlsClientCerts
 }
 
-func (c *EndpointConfig) loadPrivateKeyFromConfig(clientConfig *msp.ClientConfig, clientCerts tls.Certificate, cb []byte) ([]tls.Certificate, error) {
+func (c *EndpointConfig) loadPrivateKeyFromConfig(clientConfig *clientConfig, clientCerts tls.Certificate, cb []byte) ([]tls.Certificate, error) {
 
 	kb := clientConfig.TLSCerts.Client.Key.Bytes()
 
@@ -556,7 +566,6 @@ func (c *EndpointConfig) loadClientTLSConfig(configEntity *endpointConfigEntity)
 	//Clients Config
 	//resolve paths and org name
 	configEntity.Client.Organization = strings.ToLower(configEntity.Client.Organization)
-	configEntity.Client.TLSCerts.Path = pathvar.Subst(configEntity.Client.TLSCerts.Path)
 	configEntity.Client.TLSCerts.Client.Key.Path = pathvar.Subst(configEntity.Client.TLSCerts.Client.Key.Path)
 	configEntity.Client.TLSCerts.Client.Cert.Path = pathvar.Subst(configEntity.Client.TLSCerts.Client.Cert.Path)
 

pkg/fab/mocks/mockconfig.go

@@ -70,20 +70,21 @@ func (c *MockConfig) Client() *msp.ClientConfig {
 	}
 
 	if c.mutualTLSEnabled {
-		mutualTLSCerts := endpoint.MutualTLSConfig{
-
-			Client: endpoint.TLSKeyPair{
-				Key: endpoint.TLSConfig{
-					Path: "../../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem",
-					Pem:  "",
-				},
-				Cert: endpoint.TLSConfig{
-					Path: "../../../test/fixtures/config/mutual_tls/client_sdk_go.pem",
-					Pem:  "",
-				},
-			},
+		key := endpoint.TLSConfig{Path: "../../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem"}
+		cert := endpoint.TLSConfig{Path: "../../../test/fixtures/config/mutual_tls/client_sdk_go.pem"}
+
+		err := key.LoadBytes()
+		if err != nil {
+			panic(err)
+		}
+
+		err = cert.LoadBytes()
+		if err != nil {
+			panic(err)
 		}
-		clientConfig.TLSCerts = mutualTLSCerts
+
+		clientConfig.TLSKey = key.Bytes()
+		clientConfig.TLSCert = cert.Bytes()
 	}
 
 	return &clientConfig

pkg/fabsdk/fabsdk_chconfig_test.go

@@ -13,13 +13,14 @@ import (
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
-	mspImpl "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/msp"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
+	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/lookup"
 	mockCore "github.com/hyperledger/fabric-sdk-go/pkg/core/mocks"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/provider/chpvdr"
 	"github.com/hyperledger/fabric-sdk-go/pkg/msp"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -151,19 +152,30 @@ func getCustomBackend() ([]core.ConfigBackend, error) {
 	}
 
 	//read existing client config from config
-	clientConfig := &mspImpl.ClientConfig{}
 	configLookup := lookup.New(backend...)
-	err = configLookup.UnmarshalKey("client", clientConfig)
-	if err != nil {
-		return nil, err
+	res, ok := configLookup.Lookup("client")
+	if !ok {
+		return nil, errors.New("failed to created custom backend for test")
 	}
+	resMap := res.(map[string]interface{})
 	//update it
-	clientConfig.Organization = "org2"
+	resMap["organization"] = "org2"
 
 	//set it to backend map
 	backendMap := make(map[string]interface{})
-	backendMap["client"] = clientConfig
+	backendMap["client"] = resMap
 
 	backends := append([]core.ConfigBackend{}, &mockCore.MockConfigBackend{KeyValueMap: backendMap})
 	return append(backends, backend...), nil
 }
+
+// ClientConfig provides the definition of the client configuration
+type customClientConfig struct {
+	Organization string
+	TLSCerts     clientTLSConfig
+}
+
+type clientTLSConfig struct {
+	//Client TLS information
+	Client endpoint.TLSKeyPair
+}