working commit

Makefile.am

@@ -1,3 +1,4 @@
+
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo
 
 SUBDIRS = mans

cmd/mstorectl/accountcmd/acccmd.go

@@ -13,6 +13,10 @@ const (
 	defaultHostname = "localhost:1025"
 )
 
+func NewAccountUtil() *AccountUtil {
+	return &AccountUtil{}
+}
+
 type AccountUtil struct {
 	createAccountParams CreateAccountParams
 	updateAccountParams UpdateAccountParams

cmd/mstorectl/accountcmd/grantcmd.go

@@ -8,6 +8,19 @@ import (
 	"github.com/spf13/viper"
 )
 
+type GrantUtil struct {
+	createGrantParams CreateGrantParams
+	updateGrantParams UpdateGrantParams
+	getGrantParams    GetGrantParams
+	deleteGrantParams DeleteGrantParams
+	listGrantsParams  ListGrantsParams
+	commonGrantParams CommonGrantParams
+}
+
+func NewGrantUtil() *GrantUtil {
+	return &GrantUtil{}
+}
+
 func (util *GrantUtil) MakeGrantCmds() *cobra.Command {
 	var subCmd = &cobra.Command{
 		Use:     "grants",
@@ -79,15 +92,6 @@ func (util *GrantUtil) MakeGrantCmds() *cobra.Command {
 	return subCmd
 }
 
-type GrantUtil struct {
-	createGrantParams CreateGrantParams
-	updateGrantParams UpdateGrantParams
-	getGrantParams    GetGrantParams
-	deleteGrantParams DeleteGrantParams
-	listGrantsParams  ListGrantsParams
-	commonGrantParams CommonGrantParams
-}
-
 type CommonGrantParams struct {
 	Username      string
 	Password      string

cmd/mstorectl/filecmd/filecmd.go

@@ -11,6 +11,23 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
+type FileUtil struct {
+	fileInfoParams         FileInfoParams
+	putFileParams          PutFileParams
+	getFileParams          GetFileParams
+	deleteFileParams       DeleteFileParams
+	listFilesParams        ListFilesParams
+	importFilesParams      ImportFilesParams
+	exportFilesParams      ExportFilesParams
+	deleteCollectionParams DeleteCollectionParams
+	listCollectionsParams  ListCollectionsParams
+	commonFileParams       CommonFileParams
+}
+
+func NewFileUtil() *FileUtil {
+	return &FileUtil{}
+}
+
 func (util *FileUtil) MakeFileCmds() *cobra.Command {
 	var subCmd = &cobra.Command{
 		Use:     "files",
@@ -152,19 +169,6 @@ func (util *FileUtil) MakeCollectionCmds() *cobra.Command {
 	return subCmd
 }
 
-type FileUtil struct {
-	fileInfoParams         FileInfoParams
-	putFileParams          PutFileParams
-	getFileParams          GetFileParams
-	deleteFileParams       DeleteFileParams
-	listFilesParams        ListFilesParams
-	importFilesParams      ImportFilesParams
-	exportFilesParams      ExportFilesParams
-	deleteCollectionParams DeleteCollectionParams
-	listCollectionsParams  ListCollectionsParams
-	commonFileParams       CommonFileParams
-}
-
 type CommonFileParams struct {
 	Username      string
 	Password      string

cmd/mstorectl/imagecmd/imagecmd.go

@@ -13,22 +13,18 @@ import (
 	"github.com/spf13/viper"
 )
 
-func packUserinfo(resurseuri, username, password string) (string, error) {
+type ImageUtil struct {
-	var err error
+	imageManifestParams ImageManifestParams
-	var res string
+	imageTagsParams     ImageTagsParams
-	if !strings.Contains(resurseuri, "://") {
+	catalogImagesParams CatalogImagesParams
-		resurseuri = "https://" + resurseuri
+	pullImageParams     PullImageParams
-	}
+	pushImageParams     PushImageParams
-	uri, err := url.Parse(resurseuri)
+	deleteImageParams   DeleteImageParams
-	if err != nil {
+	commonImageParams   CommonImageParams
-		return res, err
+}
-	}
+
-	uri.Path = path.Clean(uri.Path)
+func NewImageUtil() *ImageUtil {
-	if username != "" && password != "" {
+	return &ImageUtil{}
-		uri.User = url.UserPassword(username, password)
-	}
-	res = uri.String()
-	return res, err
 }
 
 func (util *ImageUtil) CreateImageCmds() *cobra.Command {
@@ -114,20 +110,27 @@ func (util *ImageUtil) CreateImageCmds() *cobra.Command {
 	return subCmd
 }
 
-type ImageUtil struct {
-	imageManifestParams ImageManifestParams
-	imageTagsParams     ImageTagsParams
-	catalogImagesParams CatalogImagesParams
-
-	pullImageParams   PullImageParams
-	pushImageParams   PushImageParams
-	deleteImageParams DeleteImageParams
-	commonImageParams CommonImageParams
-}
-
 type CommonImageParams struct {
 	Timeout       uint64
 	Username      string
 	Password      string
 	SkipTLSVerify bool
 }
+
+func packUserinfo(resurseuri, username, password string) (string, error) {
+	var err error
+	var res string
+	if !strings.Contains(resurseuri, "://") {
+		resurseuri = "https://" + resurseuri
+	}
+	uri, err := url.Parse(resurseuri)
+	if err != nil {
+		return res, err
+	}
+	uri.Path = path.Clean(uri.Path)
+	if username != "" && password != "" {
+		uri.User = url.UserPassword(username, password)
+	}
+	res = uri.String()
+	return res, err
+}

cmd/mstorectl/util/util.go

@@ -16,12 +16,6 @@ import (
 )
 
 type Util struct {
-	// TODO: delete mixed object and use simple object?
-	accountcmd.AccountUtil
-	filecmd.FileUtil
-	imagecmd.ImageUtil
-	accountcmd.GrantUtil
-
 	rootCmd *cobra.Command
 }
 
@@ -43,11 +37,18 @@ func (util *Util) Build() error {
 	}
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
 
-	rootCmd.AddCommand(util.MakeFileCmds())
+	fileUtil := filecmd.NewFileUtil()
-	rootCmd.AddCommand(util.MakeCollectionCmds())
+	rootCmd.AddCommand(fileUtil.MakeFileCmds())
-	rootCmd.AddCommand(util.CreateImageCmds())
+	rootCmd.AddCommand(fileUtil.MakeCollectionCmds())
-	rootCmd.AddCommand(util.MakeAccountCmds())
+
-	rootCmd.AddCommand(util.MakeGrantCmds())
+	imageUtil := imagecmd.NewImageUtil()
+	rootCmd.AddCommand(imageUtil.CreateImageCmds())
+
+	accountUtil := accountcmd.NewAccountUtil()
+	rootCmd.AddCommand(accountUtil.MakeAccountCmds())
+
+	grantUtil := accountcmd.NewGrantUtil()
+	rootCmd.AddCommand(grantUtil.MakeGrantCmds())
 
 	util.rootCmd = rootCmd