fix: use the correct cache path

ekristen · Jan 23, 2025 · e88ad17 · e88ad17
1 parent d77a946
commit e88ad17
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 38 deletions.
diff --git a/pkg/provider/gpg_asset.go b/pkg/provider/gpg_asset.go
@@ -13,7 +13,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/ekristen/distillery/pkg/asset"
-	"github.com/ekristen/distillery/pkg/common"
 )
 
 type GPGAsset struct {
@@ -33,18 +32,14 @@ func (a *GPGAsset) Path() string {
 }
 
 func (a *GPGAsset) Download(ctx context.Context) error {
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-
+	var err error
 	a.KeyID, err = a.MatchedAsset.GetGPGKeyID()
 	if err != nil {
 		logrus.WithError(err).Trace("unable to get GPG key")
 		return err
 	}
 
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.Source.GetOptions().Config.GetDownloadsPath()
 	filename := strconv.FormatUint(a.KeyID, 10)
 
 	assetFile := filepath.Join(downloadsDir, filename)

diff --git a/pkg/provider/interface.go b/pkg/provider/interface.go
@@ -14,4 +14,5 @@ type ISource interface {
 	GetVersion() string
 	PreRun(context.Context) error
 	Run(context.Context) error
+	GetOptions() *Options
 }
diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -65,6 +65,10 @@ func (p *Provider) GetVersion() string {
 	return "not-implemented"
 }
 
+func (p *Provider) GetOptions() *Options {
+	return p.Options
+}
+
 // CommonRun - common run logic for all sources that includes download, extract, install and cleanup
 func (p *Provider) CommonRun(ctx context.Context) error {
 	if err := p.Download(ctx); err != nil {

diff --git a/pkg/source/github_asset.go b/pkg/source/github_asset.go
@@ -13,7 +13,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/ekristen/distillery/pkg/asset"
-	"github.com/ekristen/distillery/pkg/common"
 )
 
 type GitHubAsset struct {
@@ -43,11 +42,7 @@ func (a *GitHubAsset) Download(ctx context.Context) error {
 		logrus.Tracef("url: %s", url)
 	}
 
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.GitHub.Options.Config.GetDownloadsPath()
 
 	filename := a.ID()
 

diff --git a/pkg/source/gitlab_asset.go b/pkg/source/gitlab_asset.go
@@ -32,12 +32,7 @@ func (a *GitLabAsset) Path() string {
 }
 
 func (a *GitLabAsset) Download(ctx context.Context) error { //nolint:dupl,nolintlint
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.GitLab.Options.Config.GetDownloadsPath()
 	filename := filepath.Base(a.Link.URL)
 
 	assetFile := filepath.Join(downloadsDir, filename)

diff --git a/pkg/source/hashicorp_asset.go b/pkg/source/hashicorp_asset.go
@@ -36,12 +36,7 @@ func (a *HashicorpAsset) Path() string {
 }
 
 func (a *HashicorpAsset) Download(ctx context.Context) error {
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.Hashicorp.Options.Config.GetDownloadsPath()
 	filename := filepath.Base(a.Build.URL)
 
 	assetFile := filepath.Join(downloadsDir, filename)

diff --git a/pkg/source/homebrew_asset.go b/pkg/source/homebrew_asset.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/ekristen/distillery/pkg/asset"
 	"github.com/ekristen/distillery/pkg/clients/homebrew"
-	"github.com/ekristen/distillery/pkg/common"
 )
 
 type HomebrewAsset struct {
@@ -71,12 +70,7 @@ func (a *HomebrewAsset) getAuthToken() (*GHCRAuth, error) {
 }
 
 func (a *HomebrewAsset) Download(ctx context.Context) error {
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.Homebrew.Options.Config.GetDownloadsPath()
 	filename := filepath.Base(a.Name + ".tar.gz")
 
 	assetFile := filepath.Join(downloadsDir, filename)

diff --git a/pkg/source/http_asset.go b/pkg/source/http_asset.go
@@ -35,12 +35,7 @@ func (a *HTTPAsset) Path() string {
 }
 
 func (a *HTTPAsset) Download(ctx context.Context) error {
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		return err
-	}
-
-	downloadsDir := filepath.Join(cacheDir, common.NAME, "downloads")
+	downloadsDir := a.Source.GetOptions().Config.GetDownloadsPath()
 	filename := filepath.Base(a.URL)
 
 	assetFile := filepath.Join(downloadsDir, filename)