[FAB-16789] per PR feedback, fixed sentence about peer pulling block …

…from orderer on joining channel

Signed-off-by: Sijo Cherian <sijo@ibm.com>

Makefile

@@ -49,7 +49,7 @@ BASE_VERSION = 2.2.0
 
 # 3rd party image version
 # These versions are also set in the runners in ./integration/runners/
-COUCHDB_VER ?= 2.3
+COUCHDB_VER ?= 3.1
 KAFKA_VER ?= 5.3.1
 ZOOKEEPER_VER ?= 5.3.1
 

core/ledger/kvledger/tests/v1x_test.go

@@ -381,8 +381,8 @@ func startCouchDBWithV13Data(t *testing.T, ledgerFSRoot string) (*ledger.CouchDB
 	// set required config data to use state couchdb
 	couchdbConfig := &ledger.CouchDBConfig{
 		Address:             couchAddress,
-		Username:            "",
-		Password:            "",
+		Username:            "admin",
+		Password:            "adminpw",
 		MaxRetries:          3,
 		MaxRetriesOnStartup: 3,
 		RequestTimeout:      10 * time.Second,

core/ledger/kvledger/txmgmt/privacyenabledstate/test_exports.go

@@ -156,8 +156,8 @@ func (env *CouchDBTestEnv) Init(t testing.TB) {
 			StateDatabase: "CouchDB",
 			CouchDB: &ledger.CouchDBConfig{
 				Address:             env.couchAddress,
-				Username:            "",
-				Password:            "",
+				Username:            "admin",
+				Password:            "adminpw",
 				MaxRetries:          3,
 				MaxRetriesOnStartup: 20,
 				RequestTimeout:      35 * time.Second,

core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb_test.go

@@ -40,8 +40,8 @@ var assetJSON = []byte(`{"asset_name":"marble1","color":"blue","size":"35","owne
 func testConfig() *ledger.CouchDBConfig {
 	return &ledger.CouchDBConfig{
 		Address:               "",
-		Username:              "",
-		Password:              "",
+		Username:              "admin",
+		Password:              "adminpw",
 		MaxRetries:            3,
 		MaxRetriesOnStartup:   20,
 		RequestTimeout:        35 * time.Second,
@@ -52,8 +52,8 @@ func testConfig() *ledger.CouchDBConfig {
 func TestDBBadConnectionDef(t *testing.T) {
 	config := &ledger.CouchDBConfig{
 		Address:             badParseConnectURL,
-		Username:            "",
-		Password:            "",
+		Username:            "admin",
+		Password:            "adminpw",
 		MaxRetries:          3,
 		MaxRetriesOnStartup: 3,
 		RequestTimeout:      35 * time.Second,
@@ -114,8 +114,8 @@ func TestBadCouchDBInstance(t *testing.T) {
 	badCouchDBInstance := couchInstance{
 		conf: &ledger.CouchDBConfig{
 			Address:             badParseConnectURL,
-			Username:            "",
-			Password:            "",
+			Username:            "admin",
+			Password:            "adminpw",
 			MaxRetries:          3,
 			MaxRetriesOnStartup: 10,
 			RequestTimeout:      30 * time.Second,
@@ -319,8 +319,8 @@ func TestDBBadConnection(t *testing.T) {
 	//Limit the maxRetriesOnStartup to 3 in order to reduce time for the failure
 	config := &ledger.CouchDBConfig{
 		Address:             badConnectURL,
-		Username:            "",
-		Password:            "",
+		Username:            "admin",
+		Password:            "adminpw",
 		MaxRetries:          3,
 		MaxRetriesOnStartup: 3,
 		RequestTimeout:      35 * time.Second,
@@ -854,7 +854,6 @@ func TestCouchDBVersion(t *testing.T) {
 
 	err = checkCouchDBVersion("0.0.0.0")
 	require.Error(t, err, "Error should have been thrown for invalid version")
-
 }
 
 func TestIndexOperations(t *testing.T) {

core/ledger/kvledger/txmgmt/statedb/statecouchdb/statecouchdb_test.go

@@ -52,8 +52,8 @@ func (env *testVDBEnv) init(t *testing.T, sysNamespaces []string) {
 	}
 	config := &ledger.CouchDBConfig{
 		Address:             env.couchDBEnv.couchAddress,
-		Username:            "",
-		Password:            "",
+		Username:            "admin",
+		Password:            "adminpw",
 		InternalQueryLimit:  1000,
 		MaxBatchUpdateSize:  1000,
 		MaxRetries:          3,
@@ -1122,6 +1122,8 @@ func testFormatCheck(t *testing.T, dataFormat string, dataExists bool, expectedE
 	defer os.RemoveAll(redoPath)
 	config := &ledger.CouchDBConfig{
 		Address:             vdbEnv.couchDBEnv.couchAddress,
+		Username:            "admin",
+		Password:            "adminpw",
 		MaxRetries:          3,
 		MaxRetriesOnStartup: 20,
 		RequestTimeout:      35 * time.Second,

integration/nwo/network.go

@@ -1212,6 +1212,8 @@ func (n *Network) PeerRunner(p *Peer, env ...string) *ginkgomon.Runner {
 		commands.NodeStart{PeerID: p.ID()},
 		"",
 		fmt.Sprintf("FABRIC_CFG_PATH=%s", n.PeerDir(p)),
+		fmt.Sprintf("CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin"),
+		fmt.Sprintf("CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw"),
 	)
 	cmd.Env = append(cmd.Env, env...)
 

integration/runner/couchdb.go

@@ -23,7 +23,9 @@ import (
 	"github.com/tedsuo/ifrit"
 )
 
-const CouchDBDefaultImage = "couchdb:2.3"
+const CouchDBDefaultImage = "couchdb:3.1"
+const CouchDBUsername = "admin"
+const CouchDBPassword = "adminpw"
 
 // CouchDB manages the execution of an instance of a dockerized CounchDB
 // for tests.
@@ -96,7 +98,11 @@ func (c *CouchDB) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 			Name: c.Name,
 			Config: &docker.Config{
 				Image: c.Image,
-				Env:   []string{"_creator=" + c.creator},
+				Env: []string{
+					fmt.Sprintf("_creator=%s", c.creator),
+					fmt.Sprintf("COUCHDB_USER=%s", CouchDBUsername),
+					fmt.Sprintf("COUCHDB_PASSWORD=%s", CouchDBPassword),
+				},
 			},
 			HostConfig: hostConfig,
 		},
@@ -174,8 +180,8 @@ func endpointReady(ctx context.Context, url string) bool {
 
 func (c *CouchDB) ready(ctx context.Context, addr string) <-chan struct{} {
 	readyCh := make(chan struct{})
-	url := fmt.Sprintf("http://%s/", addr)
 	go func() {
+		url := fmt.Sprintf("http://%s:%s@%s/", CouchDBUsername, CouchDBPassword, addr)
 		ticker := time.NewTicker(100 * time.Millisecond)
 		defer ticker.Stop()
 		for {