Merge "[FAB-9258] Create interface to help with unit-tests"

hyperledger · Apr 22, 2018 · 6e186ea · 6e186ea
2 parents 0183722 + 6b16ad8
commit 6e186ea
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 22 deletions.
diff --git a/cmd/fabric-ca-client/affiliation.go b/cmd/fabric-ca-client/affiliation.go
@@ -51,7 +51,7 @@ func (c *ClientCmd) newListAffiliationCommand() *cobra.Command {
 		Long:  "List affiliations visible to caller",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			log.Level = log.LevelWarning
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}
@@ -116,7 +116,7 @@ func (c *ClientCmd) newRemoveAffiliationCommand() *cobra.Command {
 func (c *ClientCmd) runListAffiliation(cmd *cobra.Command, args []string) error {
 	log.Debugf("Entered runListAffiliation: %+v", c.dynamicAffiliation)
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -144,7 +144,7 @@ func (c *ClientCmd) runListAffiliation(cmd *cobra.Command, args []string) error
 func (c *ClientCmd) runAddAffiliation(cmd *cobra.Command, args []string) error {
 	log.Debugf("Entered runAddAffiliation: %+v", c.dynamicAffiliation)
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -168,7 +168,7 @@ func (c *ClientCmd) runAddAffiliation(cmd *cobra.Command, args []string) error {
 func (c *ClientCmd) runModifyAffiliation(cmd *cobra.Command, args []string) error {
 	log.Debugf("Entered runModifyAffiliation: %+v", c.dynamicAffiliation)
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -193,7 +193,7 @@ func (c *ClientCmd) runModifyAffiliation(cmd *cobra.Command, args []string) erro
 func (c *ClientCmd) runRemoveAffiliation(cmd *cobra.Command, args []string) error {
 	log.Debugf("Entered runRemoveAffiliation: %+v", c.dynamicAffiliation)
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -219,7 +219,7 @@ func (c *ClientCmd) affiliationPreRunE(cmd *cobra.Command, args []string) error
 		return err
 	}
 
-	err = c.configInit()
+	err = c.ConfigInit()
 	if err != nil {
 		return err
 	}

diff --git a/cmd/fabric-ca-client/clientcmd.go b/cmd/fabric-ca-client/clientcmd.go
@@ -47,6 +47,14 @@ const (
 	gencsr    = "gencsr"
 )
 
+// Command interface initializes client command and loads an identity
+type Command interface {
+	ConfigInit() error
+	LoadMyIdentity() (*lib.Identity, error)
+	GetClientCfg() *lib.ClientConfig
+	GetViper() *viper.Viper
+}
+
 type crlArgs struct {
 	// Genenerate CRL with all the certificates that were revoked after this timestamp
 	RevokedAfter string `help:"Generate CRL with certificates that were revoked after this UTC timestamp (in RFC3339 format)"`
@@ -247,8 +255,8 @@ func (c *ClientCmd) requiresUser() bool {
 	return c.name != gencsr
 }
 
-// Loads the client's identity
-func (c *ClientCmd) loadMyIdentity() (*lib.Identity, error) {
+// LoadMyIdentity loads the client's identity
+func (c *ClientCmd) LoadMyIdentity() (*lib.Identity, error) {
 	client := &lib.Client{
 		HomeDir: filepath.Dir(c.cfgFileName),
 		Config:  c.clientCfg,
@@ -261,3 +269,13 @@ func (c *ClientCmd) loadMyIdentity() (*lib.Identity, error) {
 
 	return id, nil
 }
+
+// GetClientCfg returns client configuration
+func (c *ClientCmd) GetClientCfg() *lib.ClientConfig {
+	return c.clientCfg
+}
+
+// GetViper returns the viper instance
+func (c *ClientCmd) GetViper() *viper.Viper {
+	return c.myViper
+}
diff --git a/cmd/fabric-ca-client/config.go b/cmd/fabric-ca-client/config.go
@@ -206,7 +206,8 @@ bccsp:
 `
 )
 
-func (c *ClientCmd) configInit() error {
+// ConfigInit initializes the configuration for the fabric-ca-client command
+func (c *ClientCmd) ConfigInit() error {
 	var err error
 
 	if c.debug {

diff --git a/cmd/fabric-ca-client/enroll.go b/cmd/fabric-ca-client/enroll.go
@@ -40,7 +40,7 @@ func (c *ClientCmd) newEnrollCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/gencrl.go b/cmd/fabric-ca-client/gencrl.go
@@ -44,7 +44,7 @@ func (c *ClientCmd) newGenCRLCommand() *cobra.Command {
 			if len(args) > 0 {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/gencsr.go b/cmd/fabric-ca-client/gencsr.go
@@ -35,7 +35,7 @@ func (c *ClientCmd) newGenCsrCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/getcacert.go b/cmd/fabric-ca-client/getcacert.go
@@ -47,7 +47,7 @@ func (c *ClientCmd) newGetCACertCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/identity.go b/cmd/fabric-ca-client/identity.go
@@ -55,7 +55,7 @@ func (c *ClientCmd) newListIdentityCommand() *cobra.Command {
 		Long:  "List identities visible to caller",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			log.Level = log.LevelWarning
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}
@@ -130,7 +130,7 @@ func (c *ClientCmd) newRemoveIdentityCommand() *cobra.Command {
 func (c *ClientCmd) runListIdentity(cmd *cobra.Command, args []string) error {
 	log.Debug("Entered runListIdentity")
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -160,7 +160,7 @@ func (c *ClientCmd) runAddIdentity(cmd *cobra.Command, args []string) error {
 		return errors.Errorf("Can't use 'json' flag in conjunction with other flags")
 	}
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -197,7 +197,7 @@ func (c *ClientCmd) runModifyIdentity(cmd *cobra.Command, args []string) error {
 
 	req := &api.ModifyIdentityRequest{}
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -227,7 +227,7 @@ func (c *ClientCmd) runModifyIdentity(cmd *cobra.Command, args []string) error {
 func (c *ClientCmd) runRemoveIdentity(cmd *cobra.Command, args []string) error {
 	log.Debugf("Entered runRemoveIdentity: %+v", c.dynamicIdentity)
 
-	id, err := c.loadMyIdentity()
+	id, err := c.LoadMyIdentity()
 	if err != nil {
 		return err
 	}
@@ -250,7 +250,7 @@ func (c *ClientCmd) identityPreRunE(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	err = c.configInit()
+	err = c.ConfigInit()
 	if err != nil {
 		return err
 	}

diff --git a/cmd/fabric-ca-client/reenroll.go b/cmd/fabric-ca-client/reenroll.go
@@ -39,7 +39,7 @@ func (c *ClientCmd) newReenrollCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/register.go b/cmd/fabric-ca-client/register.go
@@ -38,7 +38,7 @@ func (c *ClientCmd) newRegisterCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/fabric-ca-client/revoke.go b/cmd/fabric-ca-client/revoke.go
@@ -42,7 +42,7 @@ func (c *ClientCmd) newRevokeCommand() *cobra.Command {
 				return errors.Errorf(extraArgsError, args, cmd.UsageString())
 			}
 
-			err := c.configInit()
+			err := c.ConfigInit()
 			if err != nil {
 				return err
 			}