primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 12:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/stash: allow nonsemver requests to be resolved properly (#1015)

Browse Source
This commit is contained in:
Marwan Sulaiman
2019-01-07 20:51:22 -05:00
committed by GitHub
parent 0d94af2503
commit f0e931311b
9 changed files with 175 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/stash/stasher.go
+19 -7
View File
@@ -13,8 +13,11 @@ import (
// Stasher has the job of taking a module
// from an upstream entity and stashing it to a Storage Backend.
// It also returns a string that represents a semver version of
// what was requested, this is helpful if what was requested
// was a descriptive version such as a branch name or a full commit sha.
type Stasher interface {
Stash(ctx context.Context, mod string, ver string) error
Stash(ctx context.Context, mod string, ver string) (string, error)
}
// Wrapper helps extend the main stasher's functionality with addons.
@@ -37,7 +40,7 @@ type stasher struct {
storage storage.Backend
}
func (s *stasher) Stash(ctx context.Context, mod, ver string) error {
func (s *stasher) Stash(ctx context.Context, mod, ver string) (string, error) {
const op errors.Op = "stasher.Stash"
_, span := observ.StartSpan(ctx, op.String())
defer span.End()
@@ -49,14 +52,23 @@ func (s *stasher) Stash(ctx context.Context, mod, ver string) error {
v, err := s.fetchModule(ctx, mod, ver)
if err != nil {
return errors.E(op, err)
return "", errors.E(op, err)
}
defer v.Zip.Close()
err = s.storage.Save(ctx, mod, ver, v.Mod, v.Zip, v.Info)
if err != nil {
return errors.E(op, err)
if v.Semver != ver {
exists, err := s.storage.Exists(ctx, mod, v.Semver)
if err != nil {
return "", errors.E(op, err)
}
if exists {
return v.Semver, nil
}
}
return nil
err = s.storage.Save(ctx, mod, v.Semver, v.Mod, v.Zip, v.Info)
if err != nil {
return "", errors.E(op, err)
}
return v.Semver, nil
}
func (s *stasher) fetchModule(ctx context.Context, mod, ver string) (*storage.Version, error) {