working commit

cmd/mstorectl/imageaux.go

@@ -1,18 +0,0 @@
-package main
-
-import (
-	"crypto/tls"
-	"net/http"
-)
-
-type roundTripper struct{}
-
-func (t *roundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
-	tlsConfig := &tls.Config{
-		InsecureSkipVerify: true,
-	}
-	httpTransport := &http.Transport{
-		TLSClientConfig: tlsConfig,
-	}
-	return httpTransport.RoundTrip(r)
-}

cmd/mstorectl/imagecmd.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"mstore/pkg/client"
+
 	"github.com/spf13/cobra"
 )
 
@@ -74,7 +76,7 @@ type ImageInfoParams struct {
 }
 
 type ImageInfoResult struct {
-	ImageInfo ImageDescr `json:"imageInfo"`
+	ImageInfo *client.ImageDescr `json:"imageInfo"`
 }
 
 func (util *ImageUtil) ImageInfo(cmd *cobra.Command, args []string) {

cmd/mstorectl/imageinfo.go

@@ -4,111 +4,18 @@ import (
 	"context"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/google/go-containerregistry/pkg/name"
-	pkg "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/remote"
-	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
+	"mstore/pkg/client"
 )
 
-type ImageDescr struct {
-	ConfigFile *pkg.ConfigFile `json:"configFile,omitempty"`
-	Manifest   *pkg.Manifest   `json:"manifest,omitempty"`
-	Tags       []string        `json:"avilableTags,omitempty"`
-}
-
 func (util *ImageUtil) imageInfo(params *ImageInfoParams) (*ImageInfoResult, error) {
 	var err error
 	res := &ImageInfoResult{}
+	ctx := context.Background()
 
-	ctx, _ := context.WithTimeout(context.Background(), time.Duration(params.Timeout)*time.Second)
-
-	options := make([]crane.Option, 0)
-	options = append(options, crane.WithContext(ctx))
-
-	ref, err := name.ParseReference(params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	repo := ref.Context()
-	if err != nil {
-		return res, err
-	}
-
-	if params.Username != "" && params.Password != "" {
-		defaultTransport := &roundTripper{}
-		scopes := []string{repo.Scope(transport.PullScope)}
-
-		regName := repo.RegistryStr()
-		reg, err := name.NewRegistry(regName)
-		if err != nil {
-			return res, err
-		}
-		basicAuth := &authn.Basic{
-			Username: params.Username,
-			Password: params.Password,
-		}
-		authTransport, err := transport.NewWithContext(ctx, reg, basicAuth, defaultTransport, scopes)
-		if err != nil {
-			return res, err
-		}
-		options = append(options, crane.WithTransport(authTransport))
-	} else {
-		transport := &roundTripper{}
-		options = append(options, crane.WithTransport(transport))
-	}
-
-	image, err := crane.Pull(params.Imagepath, options...)
-	if err != nil {
-		return res, err
-	}
-
-	config, err := image.ConfigFile()
-	if err != nil {
-		return res, err
-	}
-	res.ImageInfo.ConfigFile = config
-
-	manifest, err := image.Manifest()
-	if err != nil {
-		return res, err
-	}
-	res.ImageInfo.Manifest = manifest
-
-	return res, err
-
-	remoteOptions := make([]remote.Option, 0)
-	remoteOptions = append(remoteOptions, remote.WithContext(ctx))
-
-	if params.Username != "" && params.Password != "" {
-		defaultTransport := &roundTripper{}
-		scopes := []string{repo.Scope(transport.PullScope)}
-
-		regName := repo.RegistryStr()
-		reg, err := name.NewRegistry(regName)
-		if err != nil {
-			return res, err
-		}
-		basicAuth := &authn.Basic{
-			Username: params.Username,
-			Password: params.Password,
-		}
-		authTransport, err := transport.NewWithContext(ctx, reg, basicAuth, defaultTransport, scopes)
-		if err != nil {
-			return res, err
-		}
-		remoteOptions = append(remoteOptions, remote.WithTransport(authTransport))
-	} else {
-		transport := &roundTripper{}
-		options = append(options, crane.WithTransport(transport))
-	}
-
-	tags, err := remote.List(repo, remoteOptions...)
-	if err != nil {
-		return res, err
-	}
-	res.ImageInfo.Tags = tags
+	cli := client.NewClientWithAuth(params.Username, params.Password)
+	timeout := time.Duration(params.Timeout) * time.Second
+	opres, err := cli.ImageInfo(ctx, params.Imagepath, timeout)
 
+	res.ImageInfo = opres
 	return res, err
 }

cmd/mstorectl/imagepull.go

@@ -2,75 +2,20 @@ package main
 
 import (
 	"context"
-	"os"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/google/go-containerregistry/pkg/name"
-	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
+	"mstore/pkg/client"
 )
 
 func (util *ImageUtil) pullImage(params *PullImageParams) (*PullImageResult, error) {
 	var err error
 
-	ctx, _ := context.WithTimeout(context.Background(), time.Duration(params.Timeout)*time.Second)
-
+	ctx := context.Background()
 	res := &PullImageResult{}
-	options := make([]crane.Option, 0)
-	options = append(options, crane.WithContext(ctx))
-	if params.Username != "" && params.Password != "" {
-		ref, err := name.ParseReference(params.Imagepath)
-		if err != nil {
-			return res, err
-		}
-		repo := ref.Context()
-		if err != nil {
-			return res, err
-		}
-		defaultTransport := &roundTripper{}
 
-		scopes := []string{repo.Scope(transport.PullScope)}
+	cli := client.NewClientWithAuth(params.Username, params.Password)
+	timeout := time.Duration(params.Timeout) * time.Second
+	err = cli.PullImage(ctx, params.Imagepath, params.Filepath, timeout)
 
-		regName := repo.RegistryStr()
-		reg, err := name.NewRegistry(regName)
-		if err != nil {
-			return res, err
-		}
-		basicAuth := &authn.Basic{
-			Username: params.Username,
-			Password: params.Password,
-		}
-		authTransport, err := transport.NewWithContext(ctx, reg, basicAuth, defaultTransport, scopes)
-		if err != nil {
-			return res, err
-		}
-		options = append(options, crane.WithTransport(authTransport))
-	} else {
-		transport := &roundTripper{}
-		options = append(options, crane.WithTransport(transport))
-	}
-
-	image, err := crane.Pull(params.Imagepath, options...)
-	if err != nil {
-		return res, err
-	}
-	dstDir := makeTmpFileName(params.Filepath)
-	err = os.MkdirAll(dstDir, 0750)
-	if err != nil {
-		return res, err
-	}
-	err = crane.SaveOCI(image, dstDir)
-	if err != nil {
-		return res, err
-	}
-	err = archiveDir(dstDir, params.Filepath)
-	if err != nil {
-		return res, err
-	}
-	err = os.RemoveAll(dstDir)
-	if err != nil {
-		return res, err
-	}
 	return res, err
 }

cmd/mstorectl/imagepush.go

@@ -2,105 +2,19 @@ package main
 
 import (
 	"context"
-	"fmt"
-	"os"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/google/go-containerregistry/pkg/name"
-	pkg "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/layout"
-	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
+	"mstore/pkg/client"
 )
 
 func (util *ImageUtil) pushImage(params *PushImageParams) (*PushImageResult, error) {
 	var err error
-	ctx, _ := context.WithTimeout(context.Background(), time.Duration(params.Timeout)*time.Second)
+	ctx := context.Background()
 	res := &PushImageResult{}
 
-	options := make([]crane.Option, 0)
-	options = append(options, crane.WithContext(ctx))
-	if params.Username != "" && params.Password != "" {
-		ref, err := name.ParseReference(params.Imagepath)
-		if err != nil {
-			return res, err
-		}
-		repo := ref.Context()
-		if err != nil {
-			return res, err
-		}
-		defaultTransport := &roundTripper{}
+	cli := client.NewClientWithAuth(params.Username, params.Password)
+	timeout := time.Duration(params.Timeout) * time.Second
+	err = cli.PushImage(ctx, params.Filepath, params.Imagepath, timeout)
 
-		scopes := []string{
-			repo.Scope(transport.PushScope),
-			repo.Scope(transport.PullScope),
-		}
-
-		regName := repo.RegistryStr()
-		reg, err := name.NewRegistry(regName)
-		if err != nil {
-			return res, err
-		}
-		basicAuth := &authn.Basic{
-			Username: params.Username,
-			Password: params.Password,
-		}
-
-		authTransport, err := transport.NewWithContext(ctx, reg, basicAuth,
-			defaultTransport, scopes)
-		if err != nil {
-			return res, err
-		}
-		options = append(options, crane.WithTransport(authTransport))
-	} else {
-		defaultTransport := &roundTripper{}
-		options = append(options, crane.WithTransport(defaultTransport))
-	}
-
-	dstDir := makeTmpFileName(params.Filepath)
-	err = unarchive(params.Filepath, dstDir)
-	if err != nil {
-		os.RemoveAll(dstDir)
-		return res, err
-	}
-	image, err := imageLoader(dstDir)
-	if err != nil {
-		os.RemoveAll(dstDir)
-		return res, err
-	}
-	err = crane.Push(image, params.Imagepath, options...)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-func imageLoader(dirPath string) (pkg.Image, error) {
-	var err error
-	var res pkg.Image
-	layoutPath, err := layout.FromPath(dirPath)
-	if err != nil {
-		return res, err
-	}
-	imageIndex, err := layoutPath.ImageIndex()
-	if err != nil {
-		return res, err
-	}
-	indexManifest, err := imageIndex.IndexManifest()
-	if err != nil {
-		return res, err
-	}
-	if indexManifest == nil {
-		err := fmt.Errorf("Empty indexManifest referency")
-		return res, err
-	}
-
-	manifest := indexManifest.Manifests[0]
-	image, err := layoutPath.Image(manifest.Digest)
-	if err != nil {
-		return res, err
-	}
-	res = image
 	return res, err
 }

cmd/mstorectl/taraux.go

@@ -1,129 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-func archiveDir(srcDir, dstPath string) error {
-	var err error
-	srcDir = filepath.Clean(srcDir)
-	dstPath = filepath.Clean(dstPath)
-
-	err = os.MkdirAll(filepath.Dir(dstPath), 0755)
-	if err != nil {
-		return err
-	}
-	tarFile, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0640)
-	if err != nil {
-		return err
-	}
-	defer tarFile.Close()
-
-	tarWriter := tar.NewWriter(tarFile)
-	defer tarWriter.Close()
-
-	walker := func(filePath string, fileInfo os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !fileInfo.Mode().IsRegular() {
-			return nil
-		}
-		header, err := tar.FileInfoHeader(fileInfo, fileInfo.Name())
-		if err != nil {
-			return err
-		}
-		header.Name = strings.TrimPrefix(filePath, filepath.Clean(srcDir))
-		header.Name = strings.TrimPrefix(header.Name, string(filepath.Separator))
-
-		err = tarWriter.WriteHeader(header)
-		if err != nil {
-			return err
-		}
-		file, err := os.Open(filePath)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-		_, err = io.Copy(tarWriter, file)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-	err = filepath.Walk(srcDir, walker)
-	if err != nil {
-		return err
-	}
-	return err
-}
-
-func unarchive(filePath, dstDir string) error {
-	var err error
-	err = os.MkdirAll(dstDir, 0755)
-	if err != nil {
-		return err
-	}
-	file, err := os.OpenFile(filePath, os.O_RDONLY, 0)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	tarReader := tar.NewReader(file)
-	//defer tarReader.Close()
-	for {
-		header, err := tarReader.Next()
-		switch {
-		case err == io.EOF:
-			return nil
-		case err != nil:
-			return err
-		case header == nil:
-			continue
-		}
-		target := filepath.Join(dstDir, header.Name)
-		target = filepath.Clean(target)
-		//fileInfo := header.FileInfo()
-		switch header.Typeflag {
-		case tar.TypeDir:
-			_, err := os.Stat(target)
-			if err != nil {
-				err := os.MkdirAll(target, 0755)
-				if err != nil {
-					return err
-				}
-
-			}
-		case tar.TypeReg:
-			err := os.MkdirAll(filepath.Dir(target), 0755)
-			if err != nil {
-				return err
-			}
-			file, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(header.Mode))
-			if err != nil {
-				return err
-			}
-			_, err = io.Copy(file, tarReader)
-			if err != nil {
-				return err
-			}
-			file.Close()
-		}
-	}
-	return err
-}
-
-func makeTmpFileName(prefix string) string {
-	randBytes := make([]byte, 6)
-	rand.Read(randBytes)
-	suffix := hex.EncodeToString(randBytes)
-	return fmt.Sprintf("%s.tmp.%s", prefix, suffix)
-}