installer: Add top-level E2E test for fs.AnyVersion (#43)

* installer: Add top-level E2E test for fs.AnyVersion

* Update installer_test.go

Co-authored-by: Brian Flad <bflad417@gmail.com>

* Update installer_test.go

* make file executable

Co-authored-by: Brian Flad <bflad417@gmail.com>

Author: radeksimko

fs/fs_test.go

@@ -3,8 +3,6 @@ package fs
 import (
 	"context"
 	"os"
-	"path/filepath"
-	"runtime"
 	"testing"
 
 	"github.com/hashicorp/go-version"
@@ -43,25 +41,3 @@ func TestExactVersion(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func createTempFile(t *testing.T, content string) (string, string) {
-	tmpDir := t.TempDir()
-	fileName := t.Name()
-
-	if runtime.GOOS == "windows" {
-		fileName += ".exe"
-	}
-
-	filePath := filepath.Join(tmpDir, fileName)
-	f, err := os.Create(filePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	_, err = f.WriteString(content)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return tmpDir, fileName
-}

fs/fs_unix_test.go

@@ -23,7 +23,7 @@ func TestAnyVersion_notExecutable(t *testing.T) {
 		os.Setenv("PATH", originalPath)
 	})
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	os.Setenv("PATH", dirPath)
 
 	av := &AnyVersion{
@@ -47,7 +47,7 @@ func TestAnyVersion_executable(t *testing.T) {
 		os.Setenv("PATH", originalPath)
 	})
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	os.Setenv("PATH", dirPath)
 
 	fullPath := filepath.Join(dirPath, fileName)
@@ -71,7 +71,7 @@ func TestAnyVersion_executable(t *testing.T) {
 func TestAnyVersion_exactBinPath(t *testing.T) {
 	testutil.EndToEndTest(t)
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	fullPath := filepath.Join(dirPath, fileName)
 	err := os.Chmod(fullPath, 0700)
 	if err != nil {
@@ -91,7 +91,7 @@ func TestAnyVersion_exactBinPath(t *testing.T) {
 func TestAnyVersion_exactBinPath_notExecutable(t *testing.T) {
 	testutil.EndToEndTest(t)
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	fullPath := filepath.Join(dirPath, fileName)
 	err := os.Chmod(fullPath, 0600)
 	if err != nil {

fs/fs_windows_test.go

@@ -20,7 +20,7 @@ func TestAnyVersion_executable(t *testing.T) {
 		os.Setenv("path", originalPath)
 	})
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	os.Setenv("path", dirPath)
 
 	av := &AnyVersion{
@@ -38,7 +38,7 @@ func TestAnyVersion_executable(t *testing.T) {
 func TestAnyVersion_exactBinPath(t *testing.T) {
 	testutil.EndToEndTest(t)
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	fullPath := filepath.Join(dirPath, fileName)
 
 	av := &AnyVersion{
@@ -54,7 +54,7 @@ func TestAnyVersion_exactBinPath(t *testing.T) {
 func TestAnyVersion_exactBinPath_notFound(t *testing.T) {
 	testutil.EndToEndTest(t)
 
-	dirPath, fileName := createTempFile(t, "")
+	dirPath, fileName := testutil.CreateTempFile(t, "")
 	fullPath := filepath.Join(dirPath, fileName)
 
 	err := os.Remove(fullPath)

installer_test.go

@@ -2,15 +2,18 @@ package install
 
 import (
 	"context"
+	"os"
+	"path/filepath"
 	"testing"
 
+	"github.com/hashicorp/hc-install/fs"
 	"github.com/hashicorp/hc-install/internal/testutil"
 	"github.com/hashicorp/hc-install/product"
 	"github.com/hashicorp/hc-install/releases"
 	"github.com/hashicorp/hc-install/src"
 )
 
-func TestInstaller_Ensure(t *testing.T) {
+func TestInstaller_Ensure_installable(t *testing.T) {
 	testutil.EndToEndTest(t)
 
 	// most of this logic is already tested within individual packages
@@ -34,6 +37,40 @@ func TestInstaller_Ensure(t *testing.T) {
 	}
 }
 
+func TestInstaller_Ensure_findable(t *testing.T) {
+	testutil.EndToEndTest(t)
+
+	dirPath, fileName := testutil.CreateTempFile(t, "")
+
+	fullPath := filepath.Join(dirPath, fileName)
+	err := os.Chmod(fullPath, 0700)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Setenv("PATH", dirPath)
+
+	// most of this logic is already tested within individual packages
+	// so this is just a simple E2E test to ensure the public API
+	// also works and continues working
+
+	i := NewInstaller()
+	i.SetLogger(testutil.TestLogger())
+	ctx := context.Background()
+	_, err = i.Ensure(ctx, []src.Source{
+		&fs.AnyVersion{
+			Product: &product.Product{
+				BinaryName: func() string {
+					return fileName
+				},
+			},
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestInstaller_Install(t *testing.T) {
 	testutil.EndToEndTest(t)
 

internal/testutil/temp_file.go

@@ -0,0 +1,30 @@
+package testutil
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+func CreateTempFile(t *testing.T, content string) (string, string) {
+	tmpDir := t.TempDir()
+	fileName := t.Name()
+
+	if runtime.GOOS == "windows" {
+		fileName += ".exe"
+	}
+
+	filePath := filepath.Join(tmpDir, fileName)
+	f, err := os.Create(filePath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	_, err = f.WriteString(content)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return tmpDir, fileName
+}