[FAB-8866] Rename UserName to Username

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

Author: troyronda

pkg/client/channel/api_test.go

@@ -69,8 +69,8 @@ func TestWithTargetURLsValid(t *testing.T) {
 	assert.Equal(t, npConfig1.MSPID, opts.Targets[0].MSPID(), "", "Wrong MSP")
 }
 
-func setupMockTestContext(userName string, mspID string) *fcmocks.MockContext {
-	user := fcmocks.NewMockUserWithMSPID(userName, mspID)
+func setupMockTestContext(username string, mspID string) *fcmocks.MockContext {
+	user := fcmocks.NewMockUserWithMSPID(username, mspID)
 	ctx := fcmocks.NewMockContext(user)
 	return ctx
 }

pkg/client/common/selection/dynamicselection/ccpolicyprovider.go

@@ -44,8 +44,8 @@ type CCPolicyProvider interface {
 }
 
 // NewCCPolicyProvider creates new chaincode policy data provider
-func newCCPolicyProvider(providers api.Providers, channelID string, userName string, orgName string) (CCPolicyProvider, error) {
-	if providers == nil || channelID == "" || userName == "" || orgName == "" {
+func newCCPolicyProvider(providers api.Providers, channelID string, username string, orgName string) (CCPolicyProvider, error) {
+	if providers == nil || channelID == "" || username == "" || orgName == "" {
 		return nil, errors.New("Must provide providers, channel ID, user name and organisation for cc policy provider")
 	}
 
@@ -61,7 +61,7 @@ func newCCPolicyProvider(providers api.Providers, channelID string, userName str
 		return nil, errors.New("invalid options to create identity, invalid org name")
 	}
 
-	identity, err := mgr.GetUser(userName)
+	identity, err := mgr.GetUser(username)
 	if err != nil {
 		return nil, errors.WithMessage(err, "unable to create identity for ccl policy provider")
 	}

pkg/client/common/selection/dynamicselection/dynamicselection.go

@@ -22,7 +22,7 @@ import (
 // ChannelUser contains user(identity) info to be used for specific channel
 type ChannelUser struct {
 	ChannelID string
-	UserName  string
+	Username  string
 	OrgName   string
 }
 
@@ -76,7 +76,7 @@ func (p *SelectionProvider) CreateSelectionService(channelID string) (fab.Select
 		return nil, errors.New("Must provide user for channel")
 	}
 
-	ccPolicyProvider, err := newCCPolicyProvider(p.providers, channelID, channelUser.UserName, channelUser.OrgName)
+	ccPolicyProvider, err := newCCPolicyProvider(p.providers, channelID, channelUser.Username, channelUser.OrgName)
 	if err != nil {
 		return nil, errors.WithMessage(err, "Failed to create cc policy provider")
 	}

pkg/client/common/selection/dynamicselection/dynamicselection_test.go

@@ -338,7 +338,7 @@ func TestDynamicSelection(t *testing.T) {
 		t.Fatalf("Failed to to get client context: %s", err)
 	}
 
-	mychannelUser := ChannelUser{ChannelID: "mychannel", UserName: "User1", OrgName: "Org1"}
+	mychannelUser := ChannelUser{ChannelID: "mychannel", Username: "User1", OrgName: "Org1"}
 
 	selectionProvider, err := New(ctx.Config(), []ChannelUser{mychannelUser}, nil)
 	if err != nil {
@@ -472,8 +472,8 @@ func (lbp *customLBP) Choose(peerGroups []pgresolver.PeerGroup) pgresolver.PeerG
 	return peerGroups[0]
 }
 
-func setupMockContext(userName, orgName string) context.Providers {
-	user := mocks.NewMockUserWithMSPID(userName, orgName)
+func setupMockContext(username, orgName string) context.Providers {
+	user := mocks.NewMockUserWithMSPID(username, orgName)
 	ctx := mocks.NewMockContext(user)
 	return ctx
 }

pkg/client/ledger/opts_test.go

@@ -69,8 +69,8 @@ func TestWithTargetURLsValid(t *testing.T) {
 	assert.Equal(t, npConfig1.MSPID, opts.Targets[0].MSPID(), "", "Wrong MSP")
 }
 
-func setupTestContext(userName string, mspID string) *fcmocks.MockContext {
-	user := fcmocks.NewMockUserWithMSPID(userName, mspID)
+func setupTestContext(username string, mspID string) *fcmocks.MockContext {
+	user := fcmocks.NewMockUserWithMSPID(username, mspID)
 	ctx := fcmocks.NewMockContext(user)
 	return ctx
 }

pkg/client/msp/msp.go

@@ -181,8 +181,8 @@ func (c *Client) Revoke(request *RevocationRequest) (*RevocationResponse, error)
 }
 
 // GetSigningIdentity returns a signing identity for the given user name
-func (c *Client) GetSigningIdentity(userName string) (*SigningIdentity, error) {
-	user, err := c.GetUser(userName)
+func (c *Client) GetSigningIdentity(username string) (*SigningIdentity, error) {
+	user, err := c.GetUser(username)
 	if err != nil {
 		if err == mspctx.ErrUserNotFound {
 			return nil, ErrUserNotFound
@@ -194,9 +194,9 @@ func (c *Client) GetSigningIdentity(userName string) (*SigningIdentity, error) {
 }
 
 // GetUser returns a user for the given user name
-func (c *Client) GetUser(userName string) (User, error) {
+func (c *Client) GetUser(username string) (User, error) {
 	im, _ := c.ctx.IdentityManager(c.orgName)
-	user, err := im.GetUser(userName)
+	user, err := im.GetUser(username)
 	if err != nil {
 		if err == mspctx.ErrUserNotFound {
 			return nil, ErrUserNotFound

pkg/client/msp/msp_test.go

@@ -49,36 +49,36 @@ func TestMSP(t *testing.T) {
 	}
 
 	// Empty enrollment secret
-	err = msp.Enroll("enrolledUserName", WithSecret(""))
+	err = msp.Enroll("enrolledUsername", WithSecret(""))
 	if err == nil {
 		t.Fatalf("Enroll should return error for empty enrollment secret")
 	}
 
 	// Successful enrollment scenario
 
-	enrollUserName := randomUserName()
+	enrollUsername := randomUsername()
 
-	_, err = msp.GetSigningIdentity(enrollUserName)
+	_, err = msp.GetSigningIdentity(enrollUsername)
 	if err != ErrUserNotFound {
 		t.Fatalf("Expected to not find user")
 	}
 
-	err = msp.Enroll(enrollUserName, WithSecret("enrollmentSecret"))
+	err = msp.Enroll(enrollUsername, WithSecret("enrollmentSecret"))
 	if err != nil {
 		t.Fatalf("Enroll return error %v", err)
 	}
 
-	_, err = msp.GetSigningIdentity(enrollUserName)
+	_, err = msp.GetSigningIdentity(enrollUsername)
 	if err != nil {
 		t.Fatalf("Expected to find user")
 	}
 
-	enrolledUser, err := msp.GetUser(enrollUserName)
+	enrolledUser, err := msp.GetUser(enrollUsername)
 	if err != nil {
 		t.Fatalf("Expected to find user")
 	}
 
-	if enrolledUser.Name() != enrollUserName {
+	if enrolledUser.Name() != enrollUsername {
 		t.Fatalf("Enrolled user name doesn't match")
 	}
 
@@ -107,19 +107,19 @@ func TestMSP(t *testing.T) {
 		t.Fatalf("failed to create CA client: %v", err)
 	}
 
-	org2lUserName := randomUserName()
+	org2lUsername := randomUsername()
 
-	err = msp.Enroll(org2lUserName, WithSecret("enrollmentSecret"))
+	err = msp.Enroll(org2lUsername, WithSecret("enrollmentSecret"))
 	if err != nil {
 		t.Fatalf("Enroll return error %v", err)
 	}
 
-	org2EnrolledUser, err := msp.GetUser(org2lUserName)
+	org2EnrolledUser, err := msp.GetUser(org2lUsername)
 	if err != nil {
 		t.Fatalf("Expected to find user")
 	}
 
-	if org2EnrolledUser.Name() != org2lUserName {
+	if org2EnrolledUser.Name() != org2lUsername {
 		t.Fatalf("Enrolled user name doesn't match")
 	}
 
@@ -197,6 +197,6 @@ func myMSPID(t *testing.T, c core.Config) string {
 	return orgConfig.MSPID
 }
 
-func randomUserName() string {
+func randomUsername() string {
 	return "user" + strconv.Itoa(rand.Intn(500000))
 }

pkg/client/msp/testdata/config_test.yaml

@@ -171,7 +171,7 @@ organizations:
     mspid: Org1MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
-    cryptoPath:  peerOrganizations/org1.example.com/users/{userName}@org1.example.com/msp
+    cryptoPath:  peerOrganizations/org1.example.com/users/{username}@org1.example.com/msp
 
     peers:
       - peer0.org1.example.com
@@ -205,7 +205,7 @@ organizations:
     mspid: Org2MSP
 
     # This org's MSP store (absolute path or relative to client.cryptoconfig)
-    cryptoPath:  peerOrganizations/org2.example.com/users/{userName}@org2.example.com/msp
+    cryptoPath:  peerOrganizations/org2.example.com/users/{username}@org2.example.com/msp
 
     peers:
       - peer0.org2.example.com
@@ -219,7 +219,7 @@ organizations:
       mspID: "OrdererOrg"
 
       # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode)
-      cryptoPath: ordererOrganizations/example.com/users/{userName}@example.com/msp
+      cryptoPath: ordererOrganizations/example.com/users/{username}@example.com/msp
 
 
 #

pkg/client/msp/user.go

@@ -82,12 +82,12 @@ type UserIdentifier struct {
 // PrivKeyKey is a composite key for accessing a private key in the key store
 type PrivKeyKey struct {
 	MSPID    string
-	UserName string
+	Username string
 	SKI      []byte
 }
 
 // CertKey is a composite key for accessing a cert in the cert store
 type CertKey struct {
 	MSPID    string
-	UserName string
+	Username string
 }

pkg/client/resmgmt/resmgmt_test.go

@@ -1266,8 +1266,8 @@ func setupResMgmtClient(fabCtx context.Client, discErr error, t *testing.T, opts
 
 }
 
-func setupTestContext(userName string, mspID string) *fcmocks.MockContext {
-	user := fcmocks.NewMockUserWithMSPID(userName, mspID)
+func setupTestContext(username string, mspID string) *fcmocks.MockContext {
+	user := fcmocks.NewMockUserWithMSPID(username, mspID)
 	ctx := fcmocks.NewMockContext(user)
 	return ctx
 }
@@ -1279,8 +1279,8 @@ func setupCustomOrderer(ctx *fcmocks.MockContext, mockOrderer fab.Orderer) *fcmo
 	return ctx
 }
 
-func setupTestContextWithDiscoveryError(userName string, mspID string, discErr error) *fcmocks.MockContext {
-	user := fcmocks.NewMockUserWithMSPID(userName, mspID)
+func setupTestContextWithDiscoveryError(username string, mspID string, discErr error) *fcmocks.MockContext {
+	user := fcmocks.NewMockUserWithMSPID(username, mspID)
 	dscPvdr, _ := setupTestDiscovery(discErr, nil)
 	//ignore err and set whatever you get in dscPvdr
 	ctx := fcmocks.NewMockContextWithCustomDiscovery(user, dscPvdr)