Merge branch 'master' into reorganize-integration-tests

Author: ofalvai

_tests/integration/toolprovider/asdf/harness_test.go

@@ -42,6 +42,26 @@ type testEnv struct {
 
 // createTestEnv creates an isolated installation of a given asdf version for testing.
 func createTestEnv(t *testing.T, installRequest asdfInstallation) (testEnv, error) {
+
+	if useSystemAsdf() {
+		// Remove installed tools between test runs because tests don't run their own isolated asdf install in this mode
+		out, err := exec.Command("bash", "-c", "rm -rf ~/.asdf/installs").CombinedOutput()
+		if err != nil {
+			t.Log(string(out))
+			return testEnv{}, fmt.Errorf("cleanup asdf installs between tests: %w", err)
+		}
+		out, err = exec.Command("bash", "-lc", "asdf reshim").CombinedOutput()
+		if err != nil {
+			t.Log(string(out))
+			return testEnv{}, fmt.Errorf("asdf reshim between tests: %w", err)
+		}
+
+		return testEnv{
+			envVars:   map[string]string{},
+			shellInit: "",
+		}, nil
+	}
+
 	homeDir := t.TempDir()
 	dataDir := t.TempDir()
 	shimsDir := filepath.Join(dataDir, "shims")
@@ -84,7 +104,7 @@ func createTestEnv(t *testing.T, installRequest asdfInstallation) (testEnv, erro
 func (te *testEnv) toExecEnv() execenv.ExecEnv {
 	return execenv.ExecEnv{
 		EnvVars:            te.envVars,
-		ClearInheritedEnvs: true,
+		ClearInheritedEnvs: !useSystemAsdf(),
 		ShellInit:          te.shellInit,
 	}
 }
@@ -223,3 +243,8 @@ func downloadReleaseBinary(t *testing.T, version string, targetDir string) error
 
 	return nil
 }
+
+func useSystemAsdf() bool {
+	useSystemAsdfFlag := strings.TrimSpace(os.Getenv("TOOLPROVIDER_TEST_USE_SYSTEM_ASDF"))
+	return useSystemAsdfFlag == "1" || strings.ToLower(useSystemAsdfFlag) == "true"
+}

_tests/integration/toolprovider/asdf/install_error_test.go

@@ -32,7 +32,7 @@ func TestNoMatchingVersionError(t *testing.T) {
 
 	var installErr provider.ToolInstallError
 	require.ErrorAs(t, err, &installErr)
-	require.Equal(t, "nodejs", installErr.ToolName)
+	require.Equal(t, provider.ToolID("nodejs"), installErr.ToolName)
 	require.Equal(t, "22", installErr.RequestedVersion)
 	require.Contains(t, installErr.Error(), "no match for requested version 22")
 	require.Contains(t, installErr.Recommendation, "22:latest")
@@ -60,7 +60,7 @@ func TestNewToolPluginError(t *testing.T) {
 
 	var installErr provider.ToolInstallError
 	require.ErrorAs(t, err, &installErr)
-	require.Equal(t, "foo", installErr.ToolName)
+	require.Equal(t, provider.ToolID("foo"), installErr.ToolName)
 	require.Equal(t, "1.0.0", installErr.RequestedVersion)
 	require.Equal(t, installErr.Cause, "This tool integration (foo) is not tested or vetted by Bitrise.")
 	require.Equal(t, installErr.Recommendation, "If you want to use this tool anyway, look up its asdf plugin and provide it in the `plugin` field of the tool declaration. For example: `plugin: foo::https://github/url/to/asdf/plugin/repo.git`")

_tests/integration/toolprovider/asdf/install_test.go

@@ -6,12 +6,16 @@ package asdf
 import (
 	"testing"
 
-	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
 	"github.com/bitrise-io/bitrise/v2/toolprovider/asdf"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
 	"github.com/stretchr/testify/require"
 )
 
 func TestAsdfInstallClassic(t *testing.T) {
+	if useSystemAsdf() {
+		t.Skip("Irrelevant test when using system asdf")
+	}
+
 	testEnv, err := createTestEnv(t, asdfInstallation{
 		flavor:  flavorAsdfClassic,
 		version: "0.14.0",
@@ -35,6 +39,10 @@ func TestAsdfInstallClassic(t *testing.T) {
 }
 
 func TestAsdfInstallRewrite(t *testing.T) {
+	if useSystemAsdf() {
+		t.Skip("Irrelevant test when using system asdf")
+	}
+
 	testEnv, err := createTestEnv(t, asdfInstallation{
 		flavor:  flavorAsdfRewrite,
 		version: "0.18.0",

_tests/integration/toolprovider/mise/install_error_test.go

@@ -0,0 +1,37 @@
+//go:build linux_and_mac
+// +build linux_and_mac
+
+package mise
+
+import (
+	"testing"
+
+	"github.com/bitrise-io/bitrise/v2/toolprovider/mise"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNoMatchingVersionError(t *testing.T) {
+	miseInstallDir := t.TempDir()
+	miseDataDir := t.TempDir()
+	miseProvider, err := mise.NewToolProvider(miseInstallDir, miseDataDir)
+	require.NoError(t, err)
+
+	err = miseProvider.Bootstrap()
+	require.NoError(t, err)
+
+	request := provider.ToolRequest{
+		ToolName:           provider.ToolID("nodejs"),
+		UnparsedVersion:    "0.1.0",
+		ResolutionStrategy: provider.ResolutionStrategyStrict,
+	}
+	_, err = miseProvider.InstallTool(request)
+	require.Error(t, err)
+
+	var installErr provider.ToolInstallError
+	require.ErrorAs(t, err, &installErr)
+	require.Equal(t, provider.ToolID("nodejs"), installErr.ToolName)
+	require.Equal(t, "0.1.0", installErr.RequestedVersion)
+	require.Contains(t, installErr.Error(), "failed to install nodejs 0.1.0")
+	require.Contains(t, installErr.Cause, "no match for requested version 0.1.0")
+}

_tests/integration/toolprovider/mise/install_flutter_test.go

@@ -0,0 +1,46 @@
+//go:build linux_and_mac
+// +build linux_and_mac
+
+package mise
+
+import (
+	"testing"
+
+	"github.com/bitrise-io/bitrise/v2/toolprovider/mise"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAsdfInstallFlutter(t *testing.T) {
+	tests := []struct {
+		name               string
+		requestedVersion   string
+		resolutionStrategy provider.ResolutionStrategy
+		expectedVersion    string
+	}{
+		{"Install specific version", "3.32.1-stable", provider.ResolutionStrategyStrict, "3.32.1-stable"},
+	}
+
+	for _, tt := range tests {
+		miseInstallDir := t.TempDir()
+		miseDataDir := t.TempDir()
+		miseProvider, err := mise.NewToolProvider(miseInstallDir, miseDataDir)
+		require.NoError(t, err)
+
+		err = miseProvider.Bootstrap()
+		require.NoError(t, err)
+
+		t.Run(tt.name, func(t *testing.T) {
+			request := provider.ToolRequest{
+				ToolName:           "flutter",
+				UnparsedVersion:    tt.requestedVersion,
+				ResolutionStrategy: tt.resolutionStrategy,
+			}
+			result, err := miseProvider.InstallTool(request)
+			require.NoError(t, err)
+			require.Equal(t, provider.ToolID("flutter"), result.ToolName)
+			require.Equal(t, tt.expectedVersion, result.ConcreteVersion)
+			require.False(t, result.IsAlreadyInstalled)
+		})
+	}
+}

_tests/integration/toolprovider/mise/install_golang_test.go

@@ -0,0 +1,48 @@
+//go:build linux_and_mac
+// +build linux_and_mac
+
+package mise
+
+import (
+	"testing"
+
+	"github.com/bitrise-io/bitrise/v2/toolprovider/mise"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAsdfInstallGolangVersion(t *testing.T) {
+	tests := []struct {
+		name               string
+		requestedVersion   string
+		resolutionStrategy provider.ResolutionStrategy
+		expectedVersion    string
+	}{
+		{"Install specific version", "1.23.4", provider.ResolutionStrategyStrict, "1.23.4"},
+		{"Install partial major.minor version", "1.22", provider.ResolutionStrategyLatestInstalled, "1.22.12"},
+		{"Install partial major.minor version, latest released", "1.22", provider.ResolutionStrategyLatestReleased, "1.22.12"},
+	}
+
+	for _, tt := range tests {
+		miseInstallDir := t.TempDir()
+		miseDataDir := t.TempDir()
+		miseProvider, err := mise.NewToolProvider(miseInstallDir, miseDataDir)
+		require.NoError(t, err)
+
+		err = miseProvider.Bootstrap()
+		require.NoError(t, err)
+
+		t.Run(tt.name, func(t *testing.T) {
+			request := provider.ToolRequest{
+				ToolName:           "golang",
+				UnparsedVersion:    tt.requestedVersion,
+				ResolutionStrategy: tt.resolutionStrategy,
+			}
+			result, err := miseProvider.InstallTool(request)
+			require.NoError(t, err)
+			require.Equal(t, provider.ToolID("golang"), result.ToolName)
+			require.Equal(t, tt.expectedVersion, result.ConcreteVersion)
+			require.False(t, result.IsAlreadyInstalled)
+		})
+	}
+}

_tests/integration/toolprovider/mise/install_java_test.go

@@ -0,0 +1,66 @@
+package mise
+
+import (
+	"testing"
+
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/mise"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMiseInstallJavaVersion(t *testing.T) {
+	tests := []struct {
+		name               string
+		requestedVersion   string
+		resolutionStrategy provider.ResolutionStrategy
+		expectedVersion    string
+	}{
+		{
+			name:               "OpenJDK major version only",
+			requestedVersion:   "21",
+			resolutionStrategy: provider.ResolutionStrategyStrict,
+			expectedVersion:    "21.0.2",
+		},
+		{
+			name:               "OpenJDK major version only, latest released",
+			requestedVersion:   "17",
+			resolutionStrategy: provider.ResolutionStrategyLatestReleased,
+			expectedVersion:    "17.0.2",
+		},
+		{
+			name:               "Temurin major version only",
+			requestedVersion:   "temurin-22",
+			resolutionStrategy: provider.ResolutionStrategyLatestReleased,
+			expectedVersion:    "temurin-22.0.2+9",
+		},
+		{
+			name:               "Temurin exact version",
+			requestedVersion:   "temurin-18.0.2+9",
+			resolutionStrategy: provider.ResolutionStrategyStrict,
+			expectedVersion:    "temurin-18.0.2+9",
+		},
+	}
+
+	for _, tt := range tests {
+		miseInstallDir := t.TempDir()
+		miseDataDir := t.TempDir()
+		miseProvider, err := mise.NewToolProvider(miseInstallDir, miseDataDir)
+		require.NoError(t, err)
+
+		err = miseProvider.Bootstrap()
+		require.NoError(t, err)
+
+		t.Run(tt.name, func(t *testing.T) {
+			request := provider.ToolRequest{
+				ToolName:           provider.ToolID("java"),
+				UnparsedVersion:    tt.requestedVersion,
+				ResolutionStrategy: tt.resolutionStrategy,
+			}
+			result, err := miseProvider.InstallTool(request)
+			require.NoError(t, err)
+			require.Equal(t, provider.ToolID("java"), result.ToolName)
+			require.Equal(t, tt.expectedVersion, result.ConcreteVersion)
+			require.False(t, result.IsAlreadyInstalled)
+		})
+	}
+}

_tests/integration/toolprovider/mise/install_nodejs_test.go

@@ -0,0 +1,45 @@
+package mise
+
+import (
+	"testing"
+
+	"github.com/bitrise-io/bitrise/v2/toolprovider/provider"
+	"github.com/bitrise-io/bitrise/v2/toolprovider/mise"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMiseInstallNodeVersion(t *testing.T) {
+	tests := []struct {
+		name               string
+		requestedVersion   string
+		resolutionStrategy provider.ResolutionStrategy
+		expectedVersion    string
+	}{
+		{"Install specific version", "18.16.0", provider.ResolutionStrategyStrict, "18.16.0"},
+		{"Install partial major version", "18", provider.ResolutionStrategyLatestInstalled, "18.20.8"},
+		{"Install partial major.minor version", "18.10", provider.ResolutionStrategyLatestReleased, "18.10.0"},
+	}
+
+	for _, tt := range tests {
+		miseInstallDir := t.TempDir()
+		miseDataDir := t.TempDir()
+		miseProvider, err := mise.NewToolProvider(miseInstallDir, miseDataDir)
+		require.NoError(t, err)
+
+		err = miseProvider.Bootstrap()
+		require.NoError(t, err)
+
+		t.Run(tt.name, func(t *testing.T) {
+			request := provider.ToolRequest{
+				ToolName:           provider.ToolID("nodejs"),
+				UnparsedVersion:    tt.requestedVersion,
+				ResolutionStrategy: tt.resolutionStrategy,
+			}
+			result, err := miseProvider.InstallTool(request)
+			require.NoError(t, err)
+			require.Equal(t, provider.ToolID("nodejs"), result.ToolName)
+			require.Equal(t, tt.expectedVersion, result.ConcreteVersion)
+			require.False(t, result.IsAlreadyInstalled)
+		})
+	}
+}

_tests/integration/toolprovider_test.go

@@ -10,8 +10,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestToolProvider(t *testing.T) {
+func TestDefaultToolProvider(t *testing.T) {
 	cmd := command.New(binPath(), "run", "toolprovider_test", "--config", "toolprovider_test_bitrise.yml")
 	out, err := cmd.RunAndReturnTrimmedCombinedOutput()
 	require.NoError(t, err, out)
 }
+
+func TestMiseToolProvider(t *testing.T) {
+	cmd := command.New(binPath(), "run", "toolprovider_test", "--config", "toolprovider_test_mise_bitrise.yml")
+	out, err := cmd.RunAndReturnTrimmedCombinedOutput()
+	require.NoError(t, err, out)
+}

_tests/integration/toolprovider_test_mise_bitrise.yml

@@ -0,0 +1,15 @@
+format_version: "17"
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+
+tools:
+  nodejs: 22:latest
+tool_config:
+  provider: mise
+
+workflows:
+  toolprovider_test:
+    steps:
+      - script@1:
+          title: Test activated tool
+          inputs:
+            - content: set -ex; node --version | grep -q "22"