[FAB-10568] endpoint config refactoring

- endpoint config functions to return only
required information.
- network config struct fixed to match endpointconfig entities
not config file structure.
- separate structs for unmarshalling and for entity returns


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

Author: sudeshrshetty

pkg/client/resmgmt/resmgmt_test.go

@@ -1272,8 +1272,8 @@ func getNoOrdererBackend(backend ...core.ConfigBackend) *mocks.MockConfigBackend
 func getInvalidChannelOrdererBackend(backend ...core.ConfigBackend) *mocks.MockConfigBackend {
 
 	//Create an invalid channel
-	channels := make(map[string]fab.ChannelNetworkConfig)
-	mychannel := fab.ChannelNetworkConfig{
+	channels := make(map[string]fabImpl.ChannelEndpointConfig)
+	mychannel := fabImpl.ChannelEndpointConfig{
 		Orderers: []string{"invalid.orderer.com"},
 	}
 	channels["mychannel"] = mychannel
@@ -1287,7 +1287,7 @@ func getInvalidChannelOrdererBackend(backend ...core.ConfigBackend) *mocks.MockC
 func getInvalidOrdererBackend(backend ...core.ConfigBackend) *mocks.MockConfigBackend {
 
 	//Create invalid orderer
-	networkConfig := fab.NetworkConfig{}
+	networkConfig := endpointConfigEntity{}
 	err := lookup.New(backend...).UnmarshalKey("orderers", &networkConfig.Orderers)
 	if err != nil {
 		panic(err)
@@ -1306,7 +1306,7 @@ func getInvalidOrdererBackend(backend ...core.ConfigBackend) *mocks.MockConfigBa
 func getNoEventSourceBackend(backend ...core.ConfigBackend) *mocks.MockConfigBackend {
 
 	//Create no event source channels
-	networkConfig := fab.NetworkConfig{}
+	networkConfig := endpointConfigEntity{}
 	err := lookup.New(backend...).UnmarshalKey("channels", &networkConfig.Channels)
 	if err != nil {
 		panic(err)
@@ -1339,3 +1339,9 @@ EDAKBggqhkjOPQQDAgNHADBEAiAHp5Rbp9Em1G/UmKn8WsCbqDfWecVbZPQj3RK4
 oG5kQQIgQAe4OOKYhJdh3f7URaKfGTf492/nmRmtK+ySKjpHSrU=
 -----END CERTIFICATE-----
 `
+
+//endpointConfigEntity contains endpoint config elements needed by endpointconfig
+type endpointConfigEntity struct {
+	Orderers map[string]fabImpl.OrdererConfig
+	Channels map[string]fabImpl.ChannelEndpointConfig
+}

pkg/common/providers/fab/network.go

@@ -7,23 +7,24 @@ SPDX-License-Identifier: Apache-2.0
 package fab
 
 import (
+	"crypto/x509"
+
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
-	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
 )
 
 // NetworkConfig provides a static definition of endpoint configuration network
 type NetworkConfig struct {
 	Name          string
 	Description   string
 	Version       string
-	Channels      map[string]ChannelNetworkConfig
+	Channels      map[string]ChannelEndpointConfig
 	Organizations map[string]OrganizationConfig
 	Orderers      map[string]OrdererConfig
 	Peers         map[string]PeerConfig
 }
 
-// ChannelNetworkConfig provides the definition of channels for the network
-type ChannelNetworkConfig struct {
+// ChannelEndpointConfig provides the definition of channels for the network
+type ChannelEndpointConfig struct {
 	// Orderers list of ordering service nodes
 	Orderers []string
 	// Peers a list of peer-channels that are part of this organization
@@ -70,7 +71,7 @@ type NetworkPeer struct {
 type OrganizationConfig struct {
 	MSPID                  string
 	CryptoPath             string
-	Users                  map[string]endpoint.TLSKeyPair
+	Users                  map[string]CertKeyPair
 	Peers                  []string
 	CertificateAuthorities []string
 }
@@ -79,15 +80,15 @@ type OrganizationConfig struct {
 type OrdererConfig struct {
 	URL         string
 	GRPCOptions map[string]interface{}
-	TLSCACerts  endpoint.TLSConfig
+	TLSCACert   *x509.Certificate
 }
 
 // PeerConfig defines a peer configuration
 type PeerConfig struct {
 	URL         string
 	EventURL    string
 	GRPCOptions map[string]interface{}
-	TLSCACerts  endpoint.TLSConfig
+	TLSCACert   *x509.Certificate
 }
 
 // MatchConfig contains match pattern and substitution pattern
@@ -104,3 +105,9 @@ type MatchConfig struct {
 	// this is used for Name mapping instead of hostname mappings
 	MappedName string
 }
+
+// CertKeyPair contains the private key and certificate
+type CertKeyPair struct {
+	Cert []byte
+	Key  []byte
+}

pkg/common/providers/fab/provider.go

@@ -84,7 +84,7 @@ type EndpointConfig interface {
 	PeerConfig(nameOrURL string) (*PeerConfig, bool)
 	NetworkConfig() *NetworkConfig
 	NetworkPeers() []NetworkPeer
-	ChannelConfig(name string) (*ChannelNetworkConfig, bool)
+	ChannelConfig(name string) (*ChannelEndpointConfig, bool)
 	ChannelPeers(name string) ([]ChannelPeer, bool)
 	ChannelOrderers(name string) ([]OrdererConfig, bool)
 	TLSCACertPool(certConfig ...*x509.Certificate) (*x509.CertPool, error)

pkg/common/providers/test/mockfab/mockfab.gen.go

@@ -65,12 +65,15 @@ type MutualTLSConfig struct {
 }
 
 // TLSKeyPair contains the private key and certificate for TLS encryption
+//TODO to be removed from here, instead 'TLSKeyCertPair' should be used
+//deprecated
 type TLSKeyPair struct {
 	Key  TLSConfig
 	Cert TLSConfig
 }
 
 // TLSConfig TLS configuration used in the sdk's configs.
+//deprecated
 type TLSConfig struct {
 	// the following two fields are interchangeable.
 	// If Path is available, then it will be used to load the cert

pkg/core/config/endpoint/endpoint.go

@@ -42,7 +42,7 @@ type networkConfig struct {
 	Description            string
 	Version                string
 	Client                 msp.ClientConfig
-	Channels               map[string]fab.ChannelNetworkConfig
+	Channels               map[string]fab.ChannelEndpointConfig
 	Organizations          map[string]fab.OrganizationConfig
 	Orderers               map[string]fab.OrdererConfig
 	Peers                  map[string]fab.PeerConfig

pkg/core/config/lookup/lookup_test.go

@@ -166,7 +166,7 @@ func TestOrderersURLOverride(t *testing.T) {
 
 	//Override orderer URL in endpoint config
 	//Create an empty network config
-	networkConfig := fab.NetworkConfig{}
+	networkConfig := endpointConfigEntity{}
 	err = lookup.New(configBackends...).UnmarshalKey("orderers", &networkConfig.Orderers)
 	if err != nil {
 		t.Fatal("failed to unmarshal orderer")
@@ -182,7 +182,7 @@ func TestOrderersURLOverride(t *testing.T) {
 	backends = append(backends, configBackends...)
 	endpointCfg, err := fabImpl.ConfigFromBackend(backends...)
 	if err != nil {
-		t.Fatal("failed to get endpoint config")
+		t.Fatal("failed to get endpoint config", err)
 	}
 
 	user := mspmocks.NewMockSigningIdentity("test", "test")
@@ -197,3 +197,11 @@ func TestOrderersURLOverride(t *testing.T) {
 	assert.Equal(t, 1, len(o), "expected one orderer from response orderers list")
 	assert.Equal(t, sampleOrdererURL, o[0].URL(), "orderer URL override from endpointconfig channels is not working as expected")
 }
+
+//endpointConfigEntity contains endpoint config elements needed by endpointconfig
+type endpointConfigEntity struct {
+	Channels      map[string]fab.ChannelEndpointConfig
+	Organizations map[string]fabImpl.OrganizationConfig
+	Orderers      map[string]fabImpl.OrdererConfig
+	Peers         map[string]fabImpl.PeerConfig
+}

pkg/fab/channel/transactor_test.go

@@ -247,19 +247,19 @@ func (c *ChannelConfig) resolveOptsFromConfig(ctx context.Client) error {
 	return nil
 }
 
-func (c *ChannelConfig) resolveMaxResponsesOptsFromConfig(chSdkCfg *fab.ChannelNetworkConfig) {
+func (c *ChannelConfig) resolveMaxResponsesOptsFromConfig(chSdkCfg *fab.ChannelEndpointConfig) {
 	if c.opts.MaxTargets == 0 && &chSdkCfg.Policies != nil && &chSdkCfg.Policies.QueryChannelConfig != nil {
 		c.opts.MaxTargets = chSdkCfg.Policies.QueryChannelConfig.MaxTargets
 	}
 }
 
-func (c *ChannelConfig) resolveMinResponsesOptsFromConfig(chSdkCfg *fab.ChannelNetworkConfig) {
+func (c *ChannelConfig) resolveMinResponsesOptsFromConfig(chSdkCfg *fab.ChannelEndpointConfig) {
 	if c.opts.MinResponses == 0 && &chSdkCfg.Policies != nil && &chSdkCfg.Policies.QueryChannelConfig != nil {
 		c.opts.MinResponses = chSdkCfg.Policies.QueryChannelConfig.MinResponses
 	}
 }
 
-func (c *ChannelConfig) resolveRetryOptsFromConfig(chSdkCfg *fab.ChannelNetworkConfig) {
+func (c *ChannelConfig) resolveRetryOptsFromConfig(chSdkCfg *fab.ChannelEndpointConfig) {
 	if c.opts.RetryOpts.RetryableCodes == nil {
 		if c.opts.RetryOpts.RetryableCodes == nil && &chSdkCfg.Policies != nil && &chSdkCfg.Policies.QueryChannelConfig != nil {
 			c.opts.RetryOpts = chSdkCfg.Policies.QueryChannelConfig.RetryOpts

pkg/fab/chconfig/chconfig.go

@@ -68,7 +68,7 @@ func TestChannelConfigWithPeerWithRetries(t *testing.T) {
 	defRetryOpts.InitialBackoff = 5 * time.Millisecond
 	defRetryOpts.BackoffFactor = 1.0
 
-	chConfig := &fab.ChannelNetworkConfig{
+	chConfig := &fab.ChannelEndpointConfig{
 		Policies: fab.ChannelPolicies{QueryChannelConfig: fab.QueryChannelConfigPolicy{
 			MinResponses: 2,
 			MaxTargets:   1, //Ignored since we pass targets
@@ -182,7 +182,7 @@ func TestResolveOptsFromConfig(t *testing.T) {
 
 	defRetryOpts := retry.DefaultOpts
 
-	chConfig := &fab.ChannelNetworkConfig{
+	chConfig := &fab.ChannelEndpointConfig{
 		Policies: fab.ChannelPolicies{QueryChannelConfig: fab.QueryChannelConfigPolicy{
 			MinResponses: 8,
 			MaxTargets:   9,
@@ -340,11 +340,11 @@ func (pp *mockProposalProcessor) ProcessTransactionProposal(reqCtx reqContext.Co
 //customMockConfig to mock config to override channel configuration options
 type customMockConfig struct {
 	*mocks.MockConfig
-	chConfig *fab.ChannelNetworkConfig
+	chConfig *fab.ChannelEndpointConfig
 	called   bool
 }
 
-func (c *customMockConfig) ChannelConfig(name string) (*fab.ChannelNetworkConfig, bool) {
+func (c *customMockConfig) ChannelConfig(name string) (*fab.ChannelEndpointConfig, bool) {
 	c.called = true
 	return c.chConfig, true
 }

pkg/fab/chconfig/chconfig_test.go

@@ -146,23 +146,19 @@ type connectTimeoutSetter interface {
 }
 
 // OptsFromPeerConfig returns a set of connection options from the given peer config
-func OptsFromPeerConfig(peerCfg *fab.PeerConfig) ([]options.Opt, error) {
-	certificate, _, err := peerCfg.TLSCACerts.TLSCert()
-	if err != nil {
-		return nil, err
-	}
+func OptsFromPeerConfig(peerCfg *fab.PeerConfig) []options.Opt {
 
 	opts := []options.Opt{
 		WithHostOverride(getServerNameOverride(peerCfg)),
 		WithFailFast(getFailFast(peerCfg)),
 		WithKeepAliveParams(getKeepAliveOptions(peerCfg)),
-		WithCertificate(certificate),
+		WithCertificate(peerCfg.TLSCACert),
 	}
 	if isInsecureAllowed(peerCfg) {
 		opts = append(opts, WithInsecure())
 	}
 
-	return opts, nil
+	return opts
 }
 
 func getServerNameOverride(peerCfg *fab.PeerConfig) string {