working commit

cmd/mstorectl/imagecmd/imagecmd.go

@@ -13,22 +13,18 @@ import (
 	"github.com/spf13/viper"
 )
 
-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
+type ImageUtil struct {
+	imageManifestParams ImageManifestParams
+	imageTagsParams     ImageTagsParams
+	catalogImagesParams CatalogImagesParams
+	pullImageParams     PullImageParams
+	pushImageParams     PushImageParams
+	deleteImageParams   DeleteImageParams
+	commonImageParams   CommonImageParams
+}
+
+func NewImageUtil() *ImageUtil {
+	return &ImageUtil{}
 }
 
 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
+}