app: added helm tgz handle
This commit is contained in:
+80
-110
@@ -11,8 +11,6 @@ package storage
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
@@ -25,8 +23,8 @@ import (
|
||||
|
||||
const (
|
||||
sha256prefix = "sha256:"
|
||||
filesubdir = "files"
|
||||
tmpsubdir = "tmps"
|
||||
fileSubdir = "files"
|
||||
tmpSubdir = "tmps"
|
||||
)
|
||||
|
||||
type Storage struct {
|
||||
@@ -43,23 +41,23 @@ func NewStorage(basepath string) *Storage {
|
||||
}
|
||||
|
||||
func (store *Storage) makeCollecionpath(collection string) string {
|
||||
return filepath.Join(store.basepath, filesubdir, collection)
|
||||
return filepath.Join(store.basepath, fileSubdir, collection)
|
||||
}
|
||||
|
||||
func (store *Storage) makeFilepath(collection, filename string) string {
|
||||
return filepath.Join(store.basepath, filesubdir, collection, filename)
|
||||
return filepath.Join(store.basepath, fileSubdir, collection, filename)
|
||||
}
|
||||
|
||||
func (store *Storage) makeTmppath(tmpname string) string {
|
||||
return filepath.Join(store.basepath, tmpsubdir, tmpname)
|
||||
func (store *Storage) makeTmppath(tmpName string) string {
|
||||
return filepath.Join(store.basepath, tmpSubdir, tmpName)
|
||||
}
|
||||
|
||||
func (store *Storage) makeTmpsubdir() string {
|
||||
return filepath.Join(store.basepath, tmpsubdir)
|
||||
return filepath.Join(store.basepath, tmpSubdir)
|
||||
}
|
||||
|
||||
func (store *Storage) makeFilesubdir(collection, filename string) string {
|
||||
return filepath.Join(store.basepath, filesubdir)
|
||||
return filepath.Join(store.basepath, fileSubdir)
|
||||
}
|
||||
|
||||
func (store *Storage) GetFileReader(collection, filename string) (io.ReadCloser, error) {
|
||||
@@ -80,40 +78,38 @@ func (store *Storage) WriteTempFile(source io.Reader) (string, int64, string, er
|
||||
var size int64
|
||||
var csum string
|
||||
|
||||
tmpname := fmt.Sprintf("file-%d-%d.tmp", auxuuid.NewUUID(), auxuuid.NewUUID())
|
||||
tmppath := store.makeTmppath(tmpname)
|
||||
tmpName := fmt.Sprintf("%d.tmp", auxuuid.NewUUID())
|
||||
tmpPath := store.makeTmppath(tmpName)
|
||||
|
||||
tmpdirpath := store.makeTmpsubdir()
|
||||
err = os.MkdirAll(tmpdirpath, 0750)
|
||||
if err != nil {
|
||||
return tmpname, size, csum, err
|
||||
return tmpName, size, csum, err
|
||||
}
|
||||
|
||||
file, err := os.OpenFile(tmppath, os.O_WRONLY|os.O_CREATE, 0640)
|
||||
file, err := os.OpenFile(tmpPath, os.O_WRONLY|os.O_CREATE, 0640)
|
||||
if err != nil {
|
||||
return tmpname, size, csum, err
|
||||
return tmpName, size, csum, err
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
hasher := sha256.New()
|
||||
writer := io.MultiWriter(file, hasher)
|
||||
|
||||
size, err = io.Copy(writer, source)
|
||||
hasher := NewHasher()
|
||||
mWriter := io.MultiWriter(file, hasher.Writer())
|
||||
size, err = io.Copy(mWriter, source)
|
||||
if err != nil {
|
||||
return tmpname, size, csum, err
|
||||
return tmpName, size, csum, err
|
||||
}
|
||||
csum = hex.EncodeToString(hasher.Sum(nil))
|
||||
csum = sha256prefix + csum
|
||||
csum = hasher.Hex()
|
||||
|
||||
return tmpname, size, csum, err
|
||||
return tmpName, size, csum, err
|
||||
}
|
||||
|
||||
func (store *Storage) HardlinkFile(tmpname, collection, filename string) error {
|
||||
func (store *Storage) HardlinkFile(tmpName, collection, filename string) error {
|
||||
var err error
|
||||
|
||||
dirname := store.makeCollecionpath(collection)
|
||||
_, err = os.Stat(dirname)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
if os.IsNotExist(err) {
|
||||
err = os.MkdirAll(dirname, 0750)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -122,16 +118,17 @@ func (store *Storage) HardlinkFile(tmpname, collection, filename string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
filename = store.makeFilepath(collection, filename)
|
||||
os.Remove(filename) // TODO: safe removing
|
||||
|
||||
tmpname = store.makeTmppath(tmpname)
|
||||
err = os.Link(tmpname, filename)
|
||||
_, err = os.Stat(dirname)
|
||||
if os.IsExist(err) {
|
||||
os.Remove(filename) // TODO: safe removing
|
||||
}
|
||||
tmpName = store.makeTmppath(tmpName)
|
||||
err = os.Link(tmpName, filename)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = os.Remove(tmpname)
|
||||
err = os.Remove(tmpName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -172,45 +169,37 @@ func (store *Storage) makeBlobsubdir() string {
|
||||
return filepath.Join(store.basepath, blobsubdir)
|
||||
}
|
||||
|
||||
func (store *Storage) WriteUpload(uploadID string, source io.Reader) (int64, string, error) {
|
||||
func (store *Storage) WriteUpload(upID string, source io.Reader) (int64, error) {
|
||||
var err error
|
||||
var recsize int64
|
||||
var recsum string
|
||||
|
||||
uploadDir := store.makeUpsubdir()
|
||||
_, err = os.Stat(uploadDir)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
if os.IsNotExist(err) {
|
||||
err = os.MkdirAll(uploadDir, 0750)
|
||||
if err != nil {
|
||||
return recsize, recsum, err
|
||||
return recsize, err
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return recsize, recsum, err
|
||||
return recsize, err
|
||||
}
|
||||
|
||||
uploadPath := store.makeUppath(uploadID)
|
||||
uploadFile, err := os.OpenFile(uploadPath, os.O_WRONLY|os.O_CREATE, 0644)
|
||||
upPath := store.makeUppath(upID)
|
||||
upFile, err := os.OpenFile(upPath, os.O_WRONLY|os.O_CREATE, 0644)
|
||||
if err != nil {
|
||||
return recsize, recsum, err
|
||||
return recsize, err
|
||||
}
|
||||
defer uploadFile.Close()
|
||||
|
||||
hasher := sha256.New() // TODO: upload cheking
|
||||
streamWriter := io.MultiWriter(uploadFile, hasher)
|
||||
recsize, err = io.Copy(streamWriter, source)
|
||||
defer upFile.Close()
|
||||
recsize, err = io.Copy(upFile, source)
|
||||
if err != nil {
|
||||
return recsize, recsum, err
|
||||
return recsize, err
|
||||
}
|
||||
recsum = hex.EncodeToString(hasher.Sum(nil))
|
||||
recsum = sha256prefix + recsum
|
||||
|
||||
return recsize, recsum, err
|
||||
return recsize, err
|
||||
}
|
||||
|
||||
func (store *Storage) LinkUpload(reference, digest string) error {
|
||||
var err error
|
||||
uploadPath := store.makeUppath(reference)
|
||||
upPath := store.makeUppath(reference)
|
||||
|
||||
blobdir := store.makeBlobsubdir()
|
||||
_, err = os.Stat(blobdir)
|
||||
@@ -231,18 +220,17 @@ func (store *Storage) LinkUpload(reference, digest string) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
if os.IsNotExist(err) {
|
||||
err = nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = os.Link(uploadPath, blobPath)
|
||||
err = os.Link(upPath, blobPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = os.Remove(uploadPath)
|
||||
err = os.Remove(upPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -251,8 +239,8 @@ func (store *Storage) LinkUpload(reference, digest string) error {
|
||||
|
||||
func (store *Storage) RemoveUpload(digest string) error {
|
||||
var err error
|
||||
uploadPath := store.makeUppath(digest)
|
||||
err = os.Remove(uploadPath)
|
||||
upPath := store.makeUppath(digest)
|
||||
err = os.Remove(upPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -261,88 +249,70 @@ func (store *Storage) RemoveUpload(digest string) error {
|
||||
|
||||
func (st *Storage) UploadExists(name, reference string) (bool, int64, error) {
|
||||
var err error
|
||||
var fileSize int64
|
||||
|
||||
uploadPath := st.makeUppath(reference)
|
||||
|
||||
fileStat, err := os.Stat(uploadPath)
|
||||
var size int64
|
||||
upPath := st.makeUppath(reference)
|
||||
fileStat, err := os.Stat(upPath)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return false, 0, nil
|
||||
}
|
||||
if err != nil {
|
||||
return false, 0, err
|
||||
}
|
||||
|
||||
fileSize = fileStat.Size()
|
||||
return true, fileSize, err
|
||||
size = fileStat.Size()
|
||||
return true, size, err
|
||||
}
|
||||
|
||||
func (store *Storage) WriteBlob(digest string, source io.Reader) (int64, string, error) {
|
||||
func (store *Storage) WriteBlob(digstr string, source io.Reader) (int64, error) {
|
||||
var err error
|
||||
var recsize int64
|
||||
var recsum string
|
||||
|
||||
//defer source.Close()
|
||||
|
||||
blobdir := store.makeBlobsubdir()
|
||||
_, err = os.Stat(blobdir)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
err = os.MkdirAll(blobdir, 0750)
|
||||
var size int64
|
||||
blobDir := store.makeBlobsubdir()
|
||||
_, err = os.Stat(blobDir)
|
||||
if os.IsNotExist(err) {
|
||||
err = os.MkdirAll(blobDir, 0750)
|
||||
if err != nil {
|
||||
return recsize, digest, err
|
||||
return size, err
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return recsize, digest, err
|
||||
return size, err
|
||||
}
|
||||
|
||||
blobpath := store.makeBlobpath(digest)
|
||||
blobfile, err := os.OpenFile(blobpath, os.O_WRONLY|os.O_CREATE, 0644)
|
||||
blobPath := store.makeBlobpath(digstr)
|
||||
blobFile, err := os.OpenFile(blobPath, os.O_WRONLY|os.O_CREATE, 0644)
|
||||
if err != nil {
|
||||
return recsize, digest, err
|
||||
return size, err
|
||||
}
|
||||
defer blobfile.Close()
|
||||
|
||||
hasher := sha256.New() // TODO
|
||||
multiWriter := io.MultiWriter(blobfile, hasher)
|
||||
recsize, err = io.Copy(multiWriter, source)
|
||||
defer blobFile.Close()
|
||||
size, err = io.Copy(blobFile, source)
|
||||
if err != nil {
|
||||
return recsize, digest, err
|
||||
return size, err
|
||||
}
|
||||
recsum = hex.EncodeToString(hasher.Sum(nil))
|
||||
recsum = sha256prefix + recsum
|
||||
|
||||
return recsize, recsum, err
|
||||
return size, err
|
||||
}
|
||||
|
||||
func (st *Storage) BlobExists(digest string) (bool, int64, error) {
|
||||
var err error
|
||||
var fileSize int64
|
||||
var size int64
|
||||
|
||||
blobPath := st.makeBlobpath(digest)
|
||||
|
||||
fileStat, err := os.Stat(blobPath)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
if os.IsNotExist(err) {
|
||||
return false, 0, nil
|
||||
}
|
||||
if err != nil {
|
||||
return false, 0, err
|
||||
}
|
||||
|
||||
fileSize = fileStat.Size()
|
||||
return true, fileSize, err
|
||||
size = fileStat.Size()
|
||||
return true, size, err
|
||||
}
|
||||
|
||||
func (store *Storage) BlobReader(digest string) (int64, io.ReadCloser, error) {
|
||||
var err error
|
||||
var filesize int64
|
||||
blobpath := store.makeBlobpath(digest)
|
||||
|
||||
emptyReadCloser := io.NopCloser(bytes.NewReader(nil))
|
||||
|
||||
file, err := os.OpenFile(blobpath, os.O_RDONLY, 0)
|
||||
var size int64
|
||||
blobPath := store.makeBlobpath(digest)
|
||||
nop := io.NopCloser(bytes.NewReader(nil))
|
||||
file, err := os.OpenFile(blobPath, os.O_RDONLY, 0)
|
||||
if err != nil {
|
||||
return filesize, emptyReadCloser, err
|
||||
return size, nop, err
|
||||
}
|
||||
defer func() {
|
||||
if err != nil {
|
||||
@@ -351,17 +321,17 @@ func (store *Storage) BlobReader(digest string) (int64, io.ReadCloser, error) {
|
||||
}()
|
||||
filestat, err := file.Stat()
|
||||
if err != nil {
|
||||
return filesize, emptyReadCloser, err
|
||||
return size, nop, err
|
||||
}
|
||||
filesize = filestat.Size()
|
||||
return filesize, file, err
|
||||
size = filestat.Size()
|
||||
return size, file, err
|
||||
}
|
||||
|
||||
func (store *Storage) DeleteBlob(digest string) error {
|
||||
var err error
|
||||
blobpath := store.makeBlobpath(digest)
|
||||
err = os.Remove(blobpath)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
blobPath := store.makeBlobpath(digest)
|
||||
err = os.Remove(blobPath)
|
||||
if os.IsNotExist(err) {
|
||||
err = nil
|
||||
}
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user