fix: skip updating DB when a package install is skipped

aquaproj · Jan 21, 2025 · a6353c1 · a6353c1
1 parent 24e1d7e
commit a6353c1
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/pkg/controller/exec/controller.go b/pkg/controller/exec/controller.go
@@ -64,4 +64,5 @@ type WhichController interface {
 
 type VacuumController interface {
 	Close(logE *logrus.Entry) error
+	StorePackage(logE *logrus.Entry, pkg *config.Package, pkgPath string) error
 }
diff --git a/pkg/controller/exec/exec.go b/pkg/controller/exec/exec.go
@@ -99,6 +99,13 @@ func (c *Controller) install(ctx context.Context, logE *logrus.Entry, findResult
 	}); err != nil {
 		return fmt.Errorf("install the package: %w", err)
 	}
+	if err := c.vacuum.StorePackage(logE, findResult.Package, findResult.PkgPath); err != nil {
+		logerr.WithError(logE, err).Error("store the package")
+	}
+	return c.checkExePath(ctx, logE, findResult)
+}
+
+func (c *Controller) checkExePath(ctx context.Context, logE *logrus.Entry, findResult *which.FindResult) error {
 	for i := range 10 {
 		logE.Debug("check if exec file exists")
 		if fi, err := c.fs.Stat(findResult.ExePath); err == nil {

diff --git a/pkg/controller/which/which.go b/pkg/controller/which/which.go
@@ -19,6 +19,7 @@ type FindResult struct {
 	File           *registry.File
 	Config         *aqua.Config
 	ExePath        string
+	PkgPath        string
 	ConfigFilePath string
 	EnableChecksum bool
 }
@@ -161,12 +162,21 @@ func (c *Controller) findExecFileFromPkg(logE *logrus.Entry, registries map[stri
 		return nil, nil //nolint:nilnil
 	}
 
+	cPkg := &config.Package{
+		Package:     pkg,
+		PackageInfo: pkgInfo,
+	}
+	pkgPath, err := cPkg.PkgPath(c.runtime)
+	if err != nil {
+		return nil, fmt.Errorf("get a package path: %w", err)
+	}
 	for _, file := range pkgInfo.GetFiles() {
 		findResult, err := c.findExecFileFromFile(logE, exeName, pkg, pkgInfo, file)
 		if err != nil {
 			return nil, err
 		}
 		if findResult != nil {
+			findResult.PkgPath = pkgPath
 			return findResult, nil
 		}
 	}

diff --git a/pkg/controller/which/which_internal_test.go b/pkg/controller/which/which_internal_test.go
@@ -51,6 +51,7 @@ func TestController_findExecFileFromPkg(t *testing.T) { //nolint:funlen
 					Name: "kubectl",
 				},
 				ExePath: filepath.Join("/home", "foo", ".local", "share", "aquaproj-aqua", "pkgs", "http", "storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl/kubectl"),
+				PkgPath: filepath.FromSlash("pkgs/http/storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl"),
 			},
 			registries: map[string]*registry.Config{
 				"standard": {

diff --git a/pkg/controller/which/which_test.go b/pkg/controller/which/which_test.go
@@ -3,6 +3,7 @@ package which_test
 import (
 	"context"
 	"net/http"
+	"path/filepath"
 	"testing"
 
 	"github.com/aquaproj/aqua/v2/pkg/config"
@@ -105,6 +106,7 @@ packages:
 					},
 				},
 
+				PkgPath:        filepath.FromSlash("pkgs/github_content/github.com/aquaproj/aqua-installer/v1.0.0/aqua-installer"),
 				ExePath:        "/home/foo/.local/share/aquaproj-aqua/pkgs/github_content/github.com/aquaproj/aqua-installer/v1.0.0/aqua-installer/aqua-installer",
 				ConfigFilePath: "/home/foo/workspace/aqua.yaml",
 			},
@@ -231,6 +233,7 @@ packages:
 						},
 					},
 				},
+				PkgPath:        filepath.FromSlash("pkgs/github_content/github.com/aquaproj/aqua-installer/v1.0.0/aqua-installer"),
 				ExePath:        "/home/foo/.local/share/aquaproj-aqua/pkgs/github_content/github.com/aquaproj/aqua-installer/v1.0.0/aqua-installer/aqua-installer",
 				ConfigFilePath: "/etc/aqua/aqua.yaml",
 			},

diff --git a/pkg/installpackage/download.go b/pkg/installpackage/download.go
@@ -37,6 +37,9 @@ func (is *Installer) downloadWithRetry(ctx context.Context, logE *logrus.Entry,
 				}
 				return err
 			}
+			if err := is.vacuum.StorePackage(logE, param.Package, param.PkgPath); err != nil {
+				logerr.WithError(logE, err).Error("store the package")
+			}
 			return nil
 		}
 		if !finfo.IsDir() {

diff --git a/pkg/installpackage/installer.go b/pkg/installpackage/installer.go
@@ -186,6 +186,7 @@ type DownloadParam struct {
 	Checksum        *checksum.Checksum
 	Dest            string
 	Asset           string
+	PkgPath         string
 	RequireChecksum bool
 }
 
@@ -283,15 +284,11 @@ func (is *Installer) InstallPackage(ctx context.Context, logE *logrus.Entry, par
 	if err != nil {
 		return fmt.Errorf("get the package install path: %w", err)
 	}
-
-	if err := is.vacuum.StorePackage(logE, pkg, pkgPath); err != nil {
-		logerr.WithError(logE, err).Error("store the package")
-	}
-	pkgPath = filepath.Join(is.rootDir, pkgPath)
-
+	absPkgPath := filepath.Join(is.rootDir, pkgPath)
 	if err := is.downloadWithRetry(ctx, logE, &DownloadParam{
 		Package:         pkg,
-		Dest:            pkgPath,
+		Dest:            absPkgPath,
+		PkgPath:         pkgPath,
 		Asset:           assetName,
 		Checksums:       param.Checksums,
 		RequireChecksum: param.RequireChecksum,
@@ -303,5 +300,5 @@ func (is *Installer) InstallPackage(ctx context.Context, logE *logrus.Entry, par
 		return err
 	}
 
-	return is.checkFilesWrap(ctx, logE, param, pkgPath)
+	return is.checkFilesWrap(ctx, logE, param, absPkgPath)
 }