*

Author: marcell-vida

toolprovider/mise/install.go

@@ -29,10 +29,10 @@ func (m *MiseToolProvider) installToolVersion(tool provider.ToolRequest) error {
 // Helper for easier testing.
 // Inputs: tool ID, tool version
 // Returns: latest installed version of the tool, or an error if no matching version is installed
-type latestInstalledResolver func(string, string) (string, error)
+type latestInstalledResolver func(provider.ToolID, string) (string, error)
 
 func isAlreadyInstalled(tool provider.ToolRequest, latestInstalledResolver latestInstalledResolver) (bool, error) {
-	_, err := latestInstalledResolver(string(tool.ToolName), tool.UnparsedVersion)
+	_, err := latestInstalledResolver(tool.ToolName, tool.UnparsedVersion)
 	var isAlreadyInstalled bool
 	if err != nil {
 		if errors.Is(err, errNoMatchingVersion) {
@@ -60,7 +60,7 @@ func miseVersionString(tool provider.ToolRequest, latestInstalledResolver latest
 		// https://mise.jdx.dev/configuration.html#scopes
 		miseVersionString = fmt.Sprintf("%s@prefix:%s", tool.ToolName, tool.UnparsedVersion)
 	case provider.ResolutionStrategyLatestInstalled:
-		latestInstalledV, err := latestInstalledResolver(string(tool.ToolName), tool.UnparsedVersion)
+		latestInstalledV, err := latestInstalledResolver(tool.ToolName, tool.UnparsedVersion)
 		if err == nil {
 			miseVersionString = fmt.Sprintf("%s@%s", tool.ToolName, latestInstalledV)
 		} else {
@@ -74,7 +74,6 @@ func miseVersionString(tool provider.ToolRequest, latestInstalledResolver latest
 	default:
 		return "", fmt.Errorf("unknown resolution strategy: %v", tool.ResolutionStrategy)
 	}
-
 	return miseVersionString, nil
 
 }

toolprovider/mise/install_test.go

@@ -13,7 +13,6 @@ func TestMiseVersionString(t *testing.T) {
 	tests := []struct {
 		name    string
 		tool    provider.ToolRequest
-		backend string
 		want    string
 		wantErr bool
 	}{
@@ -91,7 +90,7 @@ func TestMiseVersionString(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			latestInstalledResolver := func(toolName, version string) (string, error) {
+			latestInstalledResolver := func(toolName provider.ToolID, version string) (string, error) {
 				// Setup fake behavior based on test case
 				switch tt.tool.ToolName {
 				case "go":
@@ -162,7 +161,7 @@ func TestIsAlreadyInstalled(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			latestInstalledResolver := func(toolName, version string) (string, error) {
+			latestInstalledResolver := func(toolName provider.ToolID, version string) (string, error) {
 				if tt.latestInstalledError != nil {
 					return "", tt.latestInstalledError
 				}

toolprovider/mise/mise.go

@@ -42,9 +42,8 @@ var miseStableChecksums = map[string]string{
 }
 
 const (
-	nixpkgsPluginGitURL  = "https://github.com/bitrise-io/mise-nixpkgs-plugin.git"
-	nixpkgsPluginName    = "mise-nixpkgs-plugin"
-	nixpkgsIndexFileName = "nixpkgs-index.json"
+	nixpkgsPluginGitURL = "https://github.com/bitrise-io/mise-nixpkgs-plugin.git"
+	nixpkgsPluginName   = "mise-nixpkgs-plugin"
 )
 
 type MiseToolProvider struct {
@@ -259,19 +258,6 @@ func findPluginPath() (string, error) {
 	return pluginPath, nil
 }
 
-// findIndexPath finds the nixpkgs-index.json file in the plugin folder.
-func findIndexPath() (string, error) {
-	pluginPath, err := findPluginPath()
-	if err == nil {
-		indexPath := filepath.Join(pluginPath, nixpkgsIndexFileName)
-		if _, err := os.Stat(indexPath); err == nil {
-			return indexPath, nil
-		}
-	}
-
-	return "", fmt.Errorf("%s not found in plugin folder", nixpkgsIndexFileName)
-}
-
 // getNixpkgsPlugin clones or updates the nixpkgs backend plugin and links it to mise.
 // If the plugin directory doesn't exist, it clones from the git URL.
 // If it exists, it checks out the specified commit/branch.

toolprovider/mise/resolve.go

@@ -23,22 +23,22 @@ func (m *MiseToolProvider) resolveToConcreteVersionAfterInstall(tool provider.To
 	// But we can use `mise latest` to find out the concrete version.
 	switch tool.ResolutionStrategy {
 	case provider.ResolutionStrategyLatestInstalled:
-		return m.resolveToLatestInstalled(string(tool.ToolName), tool.UnparsedVersion)
+		return m.resolveToLatestInstalled(tool.ToolName, tool.UnparsedVersion)
 	case provider.ResolutionStrategyLatestReleased, provider.ResolutionStrategyStrict:
 		// Mise works with fuzzy versions by default, so it happily installs both node@20 and [email protected].
 		// Therefore, when the Bitrise config contains simply 20 (and not 20:latest), it actually behaves
 		// as "latest released".
-		return m.resolveToLatestReleased(string(tool.ToolName), tool.UnparsedVersion)
+		return m.resolveToLatestReleased(tool.ToolName, tool.UnparsedVersion)
 	default:
 		return "", fmt.Errorf("unknown resolution strategy: %v", tool.ResolutionStrategy)
 	}
 }
 
-func (m *MiseToolProvider) resolveToLatestReleased(toolName, version string) (string, error) {
+func (m *MiseToolProvider) resolveToLatestReleased(toolName provider.ToolID, version string) (string, error) {
 	return resolveToLatestReleased(&m.ExecEnv, toolName, version)
 }
 
-func resolveToLatestReleased(executor MiseExecutor, toolName, version string) (string, error) {
+func resolveToLatestReleased(executor MiseExecutor, toolName provider.ToolID, version string) (string, error) {
 	// Even if version is empty string "sometool@" will not cause an error.
 	output, err := executor.RunMiseWithTimeout(execenv.DefaultTimeout, "latest", fmt.Sprintf("%s@%s", toolName, version))
 	if err != nil {
@@ -53,13 +53,13 @@ func resolveToLatestReleased(executor MiseExecutor, toolName, version string) (s
 	return v, nil
 }
 
-func (m *MiseToolProvider) resolveToLatestInstalled(toolName, version string) (string, error) {
+func (m *MiseToolProvider) resolveToLatestInstalled(toolName provider.ToolID, version string) (string, error) {
 	return resolveToLatestInstalled(&m.ExecEnv, toolName, version)
 }
 
-func resolveToLatestInstalled(executor MiseExecutor, toolName, version string) (string, error) {
+func resolveToLatestInstalled(executor MiseExecutor, toolName provider.ToolID, version string) (string, error) {
 	// Even if version is empty string "sometool@" will not cause an error.
-	var toolString = toolName
+	var toolString = string(toolName)
 	if version != "" && version != "installed" {
 		// tool@installed is not valid, so only append version when it's not "installed"
 		toolString = fmt.Sprintf("%s@%s", toolName, version)

toolprovider/mise/resolve_test.go

@@ -353,7 +353,7 @@ func TestResolveToLatestReleased(t *testing.T) {
 			mock := newMockMiseExecutor()
 			tt.setupMock(mock)
 
-			version, err := resolveToLatestReleased(mock, string(tt.toolName), tt.version)
+			version, err := resolveToLatestReleased(mock, tt.toolName, tt.version)
 
 			if tt.wantErr {
 				if err == nil {
@@ -468,7 +468,7 @@ func TestResolveToLatestInstalled(t *testing.T) {
 			mock := newMockMiseExecutor()
 			tt.setupMock(mock)
 
-			version, err := resolveToLatestInstalled(mock, string(tt.toolName), tt.version)
+			version, err := resolveToLatestInstalled(mock, tt.toolName, tt.version)
 
 			if tt.wantErr {
 				if err == nil {