Merge branch 'release-2.5' into release-2.5-bft

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>

# Conflicts:
#	go.mod
#	go.sum
#	tools/go.mod
#	tools/go.sum
#	vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md
#	vendor/github.com/onsi/ginkgo/v2/core_dsl.go
#	vendor/github.com/onsi/ginkgo/v2/ginkgo/main.go
#	vendor/github.com/onsi/ginkgo/v2/ginkgo_t_dsl.go
#	vendor/github.com/onsi/ginkgo/v2/internal/node.go
#	vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go
#	vendor/github.com/onsi/ginkgo/v2/table_dsl.go
#	vendor/github.com/onsi/ginkgo/v2/types/config.go
#	vendor/github.com/onsi/ginkgo/v2/types/types.go
#	vendor/github.com/onsi/ginkgo/v2/types/version.go
#	vendor/github.com/onsi/gomega/CHANGELOG.md
#	vendor/github.com/onsi/gomega/gomega_dsl.go
#	vendor/github.com/onsi/gomega/gstruct/fields.go
#	vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
#	vendor/google.golang.org/protobuf/internal/filedesc/editions.go
#	vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
#	vendor/google.golang.org/protobuf/internal/version/version.go
#	vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
#	vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
#	vendor/modules.txt

Author: pfi79

bccsp/factory/nopkcs11.go

@@ -1,5 +1,4 @@
 //go:build !pkcs11
-// +build !pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/factory/nopkcs11_test.go

@@ -1,5 +1,4 @@
 //go:build !pkcs11
-// +build !pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/factory/pkcs11.go

@@ -1,5 +1,4 @@
 //go:build pkcs11
-// +build pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/factory/pkcs11_test.go

@@ -1,5 +1,4 @@
 //go:build pkcs11
-// +build pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/factory/pkcs11factory.go

@@ -1,5 +1,4 @@
 //go:build pkcs11
-// +build pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/factory/pkcs11factory_test.go

@@ -1,5 +1,4 @@
 //go:build pkcs11
-// +build pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

bccsp/pkcs11/pkcs11_test.go

@@ -1,5 +1,4 @@
 //go:build pkcs11
-// +build pkcs11
 
 /*
 Copyright IBM Corp. All Rights Reserved.

core/deliverservice/config.go

@@ -11,6 +11,7 @@ import (
 	"io/ioutil"
 	"time"
 
+	"github.com/hyperledger/fabric/common/viperutil"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/internal/pkg/comm"
 	"github.com/hyperledger/fabric/internal/pkg/peer/orderers"
@@ -72,7 +73,7 @@ func GlobalConfig() *DeliverServiceConfig {
 // LoadOverridesMap reads and returns endpoints from the peer config
 func LoadOverridesMap() (map[string]*orderers.Endpoint, error) {
 	var overrides []AddressOverride
-	err := viper.UnmarshalKey("peer.deliveryclient.addressOverrides", &overrides)
+	err := viper.UnmarshalKey("peer.deliveryclient.addressOverrides", &overrides, viper.DecodeHook(viperutil.YamlStringToStructHook(overrides)))
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not unmarshal peer.deliveryclient.addressOverrides")
 	}

core/deliverservice/config_test.go

@@ -11,14 +11,15 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hyperledger/fabric/core/deliverservice"
+	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/hyperledger/fabric/internal/pkg/comm"
 	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 )
 
 func TestSecureOptsConfig(t *testing.T) {
@@ -161,6 +162,37 @@ func TestLoadOverridesMap(t *testing.T) {
 		require.Equal(t, "addressTo2", ep2.Address)
 	})
 
+	t.Run("GreenPath With Env", func(t *testing.T) {
+		t.Setenv("CORE_PEER_DELIVERYCLIENT_ADDRESSOVERRIDES", "[{from: addressFrom1, to: addressTo1, caCertsFile: testdata/cert.pem}"+
+			", {from: addressFrom2, to: addressTo2, caCertsFile: testdata/cert.pem}]")
+		config := `
+                  peer:
+                    deliveryclient:
+                      addressOverrides:
+                `
+
+		viper.Reset()
+
+		viper.SetEnvPrefix(common.CmdRoot)
+		viper.AllowEmptyEnv(true)
+		viper.AutomaticEnv()
+		replacer := strings.NewReplacer(".", "_")
+		viper.SetEnvKeyReplacer(replacer)
+
+		viper.SetConfigType("yaml")
+		err := viper.ReadConfig(bytes.NewBuffer([]byte(config)))
+		require.NoError(t, err)
+		res, err := deliverservice.LoadOverridesMap()
+		require.NoError(t, err)
+		require.Len(t, res, 2)
+		ep1, ok := res["addressFrom1"]
+		require.True(t, ok)
+		require.Equal(t, "addressTo1", ep1.Address)
+		ep2, ok := res["addressFrom2"]
+		require.True(t, ok)
+		require.Equal(t, "addressTo2", ep2.Address)
+	})
+
 	t.Run("MissingCAFiles", func(t *testing.T) {
 		config := `
                   peer:

core/handlers/library/noplugin_test.go

@@ -1,5 +1,4 @@
 //go:build noplugin
-// +build noplugin
 
 /*
 Copyright IBM Corp. All Rights Reserved.