qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 08:48:13 -07:00
Code Releases Activity

cmd/go/internal/modfetch: export new func Unzip

Browse Source 
Add new func Unzip, which is Download (= download+unzip)
without the download. This will be used for unpacking the
FIPS module zips, which are part of the Go distribution,
not downloaded.

Change-Id: Ia04f8c376db8cb1cf27acb5567dd256afb10f410
Reviewed-on: https://go-review.googlesource.com/c/go/+/629200
Auto-Submit: Russ Cox <rsc@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Russ Cox 2024-11-17 16:54:11 -05:00 committed by Gopher Robot
parent 9935dd99da
commit e33f7c42b0
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cmd/go/internal/modfetch/fetch.go
View File

@ -72,6 +72,30 @@ func Download(ctx context.Context, mod module.Version) (dir string, err error) {
})
}
// Unzip is like Download but is given the explicit zip file to use,
// rather than downloading it. This is used for the GOFIPS140 zip files,
// which ship in the Go distribution itself.
func Unzip(ctx context.Context, mod module.Version, zipfile string) (dir string, err error) {
if err := checkCacheDir(ctx); err != nil {
base.Fatal(err)
}
return downloadCache.Do(mod, func() (string, error) {
ctx, span := trace.StartSpan(ctx, "modfetch.Unzip "+mod.String())
defer span.Done()
dir, err = DownloadDir(ctx, mod)
if err == nil {
// The directory has already been completely extracted (no .partial file exists).
return dir, nil
} else if dir == "" || !errors.Is(err, fs.ErrNotExist) {
return "", err
}
return unzip(ctx, mod, zipfile)
})
}
func download(ctx context.Context, mod module.Version) (dir string, err error) {
ctx, span := trace.StartSpan(ctx, "modfetch.download "+mod.String())
defer span.Done()
@ -92,17 +116,21 @@ func download(ctx context.Context, mod module.Version) (dir string, err error) {
return "", err
}
return unzip(ctx, mod, zipfile)
}
func unzip(ctx context.Context, mod module.Version, zipfile string) (dir string, err error) {
unlock, err := lockVersion(ctx, mod)
if err != nil {
return "", err
}
defer unlock()
ctx, span = trace.StartSpan(ctx, "unzip "+zipfile)
ctx, span := trace.StartSpan(ctx, "unzip "+zipfile)
defer span.Done()
// Check whether the directory was populated while we were waiting on the lock.
_, dirErr := DownloadDir(ctx, mod)
dir, dirErr := DownloadDir(ctx, mod)
if dirErr == nil {
return dir, nil
}