ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal/providercache: Fix incorrect logic in Installer.SetGlobalCacheDir 

Due to some incomplete rework of this function in an earlier commit, the
safety check for using the same directory as both the target and the
cache was inverted and was raising an error _unless_ they matched, rather
than _if_ they matched.

This change is verified by the e2etest TestInitProviders_pluginCache,
which is also updated to use the new-style cache directory layout as part
of this commit.
This commit is contained in:
Martin Atkins 2020-04-01 14:59:55 -07:00
parent 14d456372a
commit f35ebe2d65
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
command/e2etest/init_test.go
View File

@ -96,16 +96,19 @@ func TestInitProviders_pluginCache(t *testing.T) {
// Our fixture dir has a generic os_arch dir, which we need to customize // Our fixture dir has a generic os_arch dir, which we need to customize
// to the actual OS/arch where this test is running in order to get the // to the actual OS/arch where this test is running in order to get the
// desired result. // desired result.
fixtMachineDir := tf.Path("cache/os_arch") fixtMachineDir := tf.Path("cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch")
wantMachineDir := tf.Path("cache", fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)) wantMachineDir := tf.Path("cache/registry.terraform.io/hashicorp/template/2.1.0/", fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH))
os.Rename(fixtMachineDir, wantMachineDir) err := os.Rename(fixtMachineDir, wantMachineDir)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
cmd := tf.Cmd("init") cmd := tf.Cmd("init")
cmd.Env = append(cmd.Env, "TF_PLUGIN_CACHE_DIR=./cache") cmd.Env = append(cmd.Env, "TF_PLUGIN_CACHE_DIR=./cache")
cmd.Stdin = nil cmd.Stdin = nil
cmd.Stderr = &bytes.Buffer{} cmd.Stderr = &bytes.Buffer{}
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
t.Errorf("unexpected error: %s", err) t.Errorf("unexpected error: %s", err)
} }
@ -115,7 +118,7 @@ func TestInitProviders_pluginCache(t *testing.T) {
t.Errorf("unexpected stderr output:\n%s\n", stderr) t.Errorf("unexpected stderr output:\n%s\n", stderr)
} }
path := fmt.Sprintf(".terraform/plugins/%s_%s/terraform-provider-template_v2.1.0_x4", runtime.GOOS, runtime.GOARCH) path := fmt.Sprintf(".terraform/plugins/registry.terraform.io/hashicorp/template/2.1.0/%s_%s/terraform-provider-template_v2.1.0_x4", runtime.GOOS, runtime.GOARCH)
content, err := tf.ReadFile(path) content, err := tf.ReadFile(path)
if err != nil { if err != nil {
t.Fatalf("failed to read installed plugin from %s: %s", path, err) t.Fatalf("failed to read installed plugin from %s: %s", path, err)
@ -124,11 +127,11 @@ func TestInitProviders_pluginCache(t *testing.T) {
t.Errorf("template plugin was not installed from local cache") t.Errorf("template plugin was not installed from local cache")
} }
if !tf.FileExists(fmt.Sprintf(".terraform/plugins/%s_%s/terraform-provider-null_v2.1.0_x4", runtime.GOOS, runtime.GOARCH)) { if !tf.FileExists(fmt.Sprintf(".terraform/plugins/registry.terraform.io/hashicorp/null/2.1.0/%s_%s/terraform-provider-null_v2.1.0_x4", runtime.GOOS, runtime.GOARCH)) {
t.Errorf("null plugin was not installed") t.Errorf("null plugin was not installed")
} }
if !tf.FileExists(fmt.Sprintf("cache/%s_%s/terraform-provider-null_v2.1.0_x4", runtime.GOOS, runtime.GOARCH)) { if !tf.FileExists(fmt.Sprintf("cache/registry.terraform.io/hashicorp/null/2.1.0/%s_%s/terraform-provider-null_v2.1.0_x4", runtime.GOOS, runtime.GOARCH)) {
t.Errorf("null plugin is not in cache after install") t.Errorf("null plugin is not in cache after install")
} }
} }

0
command/e2etest/testdata/plugin-cache/cache/os_arch/terraform-provider-template_v2.1.0_x4 → command/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 vendored
View File

4
internal/providercache/installer.go
View File

@ -64,8 +64,8 @@ func (i *Installer) SetGlobalCacheDir(cacheDir *Dir) {
// A little safety check to catch straightforward mistakes where the // A little safety check to catch straightforward mistakes where the
// directories overlap. Better to panic early than to do // directories overlap. Better to panic early than to do
// possibly-distructive actions on the cache directory downstream. // possibly-distructive actions on the cache directory downstream.
if same, err := copydir.SameFile(i.targetDir.baseDir, cacheDir.baseDir); err == nil && !same { if same, err := copydir.SameFile(i.targetDir.baseDir, cacheDir.baseDir); err == nil && same {
panic(fmt.Sprintf("global cache directory %s must not match the installation target directory", i.targetDir.baseDir)) panic(fmt.Sprintf("global cache directory %s must not match the installation target directory %s", cacheDir.baseDir, i.targetDir.baseDir))
} }
i.globalCacheDir = cacheDir i.globalCacheDir = cacheDir
} }