upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-06-09 08:58:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

use plugin cache for provider lock across for all platforms

Browse source 
The cache architecture already supports multi-platform, the only
downside is that this might grow the cache. This seems expected.
This commit is contained in:
Daniel Schmidt 2024-02-08 13:10:41 +01:00
parent 2c98e6a347
commit f720a060ff
No known key found for this signature in database
GPG key ID: 377C3A4D62FBBBE2
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/command/providers_lock.go
View file

@ -249,8 +249,8 @@ func (c *ProvidersLockCommand) Run(args []string) int {
// Use global plugin cache for extra speed if this architecture matches the systems (and therefore the caches) one
globalCacheDir := c.providerGlobalCacheDir()
if globalCacheDir != nil && platform == getproviders.CurrentPlatform {
installer.SetGlobalCacheDir(globalCacheDir)
if globalCacheDir != nil {
installer.SetGlobalCacheDir(globalCacheDir.WithPlatform(platform))
installer.SetGlobalCacheDirMayBreakDependencyLockFile(c.PluginCacheMayBreakDependencyLockFile)
}

6
internal/providercache/dir.go
View file

@ -75,6 +75,12 @@ func (d *Dir) BasePath() string {
return filepath.Clean(d.baseDir)
}
// WithPlatform creates a new dir with the provided platform based
// on this dir
func (d *Dir) WithPlatform(platform getproviders.Platform) *Dir {
return NewDirWithPlatform(d.baseDir, platform)
}
// AllAvailablePackages returns a description of all of the packages already
// present in the directory. The cache entries are grouped by the provider
// they relate to and then sorted by version precedence, with highest