fix: correct concurrency to align with documentation (#2014)

Co-authored-by: Trevor Brown <[email protected]>

Author: andrecloutier

internal/config/config.go

@@ -83,6 +83,7 @@ func defaultSettings() *Settings {
 		AlwaysKeepDownload:                false,
 		PluginRepositoryLastCheckDuration: pluginRepoCheckDurationDefault,
 		DisablePluginShortNameRepository:  false,
+		Concurrency:                       getConcurrency("auto"),
 	}
 }
 
@@ -169,7 +170,7 @@ func (c *Config) DisablePluginShortNameRepository() (bool, error) {
 func (c *Config) Concurrency() (string, error) {
 	err := c.loadSettings()
 	if err != nil {
-		return "", err
+		return getConcurrency("auto"), err
 	}
 
 	return c.Settings.Concurrency, nil
@@ -248,7 +249,11 @@ func loadSettings(asdfrcPath string) (Settings, error) {
 	boolOverride(&settings.LegacyVersionFile, mainConf, "legacy_version_file")
 	boolOverride(&settings.AlwaysKeepDownload, mainConf, "always_keep_download")
 	boolOverride(&settings.DisablePluginShortNameRepository, mainConf, "disable_plugin_short_name_repository")
-	settings.Concurrency = strings.ToLower(mainConf.Key("concurrency").String())
+
+	concurrency := strings.ToLower(mainConf.Key("concurrency").String())
+	if concurrency != "" {
+		settings.Concurrency = getConcurrency(concurrency)
+	}
 
 	return *settings, nil
 }
@@ -263,3 +268,15 @@ func boolOverride(field *bool, section *ini.Section, key string) {
 		*field = false
 	}
 }
+
+func getConcurrency(concurrency string) string {
+	concurrencyFromEnv := strings.ToLower(os.Getenv("ASDF_CONCURRENCY"))
+	if concurrencyFromEnv != "" {
+		concurrency = concurrencyFromEnv
+	}
+
+	if concurrency == "auto" || concurrency == "" {
+		return strconv.Itoa(runtime.NumCPU())
+	}
+	return concurrency
+}

internal/config/config_test.go

@@ -1,6 +1,8 @@
 package config
 
 import (
+	"runtime"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -64,18 +66,39 @@ func TestLoadSettings(t *testing.T) {
 		assert.True(t, settings.PluginRepositoryLastCheckDuration.Never, "PluginRepositoryLastCheckDuration field has wrong value")
 		assert.Zero(t, settings.PluginRepositoryLastCheckDuration.Every, "PluginRepositoryLastCheckDuration field has wrong value")
 		assert.True(t, settings.DisablePluginShortNameRepository, "DisablePluginShortNameRepository field has wrong value")
+		assert.Equal(t, "5", settings.Concurrency, "Concurrency field has wrong value")
+	})
+
+	t.Run("ASDF_CONCURRENCY=99 takes precedence over asdfrc value", func(t *testing.T) {
+		t.Setenv("ASDF_CONCURRENCY", "99")
+		settings, err := loadSettings("testdata/asdfrc")
+		assert.Nil(t, err)
+
+		assert.True(t, settings.Loaded, "Expected Loaded field to be set to true")
+		assert.Equal(t, "99", settings.Concurrency, "Concurrency field has wrong value")
+	})
+
+	t.Run("ASDF_CONCURRENCY=auto takes precedence over asdfrc value", func(t *testing.T) {
+		expectedConcurrency := strconv.Itoa(runtime.NumCPU())
+		t.Setenv("ASDF_CONCURRENCY", "auto")
+		settings, err := loadSettings("testdata/asdfrc")
+		assert.Nil(t, err)
+
+		assert.True(t, settings.Loaded, "Expected Loaded field to be set to true")
+		assert.Equal(t, expectedConcurrency, settings.Concurrency, "Concurrency field has wrong value")
 	})
 
 	t.Run("When given path to empty file returns settings struct with defaults", func(t *testing.T) {
+		expectedConcurrency := strconv.Itoa(runtime.NumCPU())
 		settings, err := loadSettings("testdata/empty-asdfrc")
-
 		assert.Nil(t, err)
 
 		assert.False(t, settings.LegacyVersionFile, "LegacyVersionFile field has wrong value")
 		assert.False(t, settings.AlwaysKeepDownload, "AlwaysKeepDownload field has wrong value")
 		assert.False(t, settings.PluginRepositoryLastCheckDuration.Never, "PluginRepositoryLastCheckDuration field has wrong value")
 		assert.Equal(t, settings.PluginRepositoryLastCheckDuration.Every, 60, "PluginRepositoryLastCheckDuration field has wrong value")
 		assert.False(t, settings.DisablePluginShortNameRepository, "DisablePluginShortNameRepository field has wrong value")
+		assert.Equal(t, expectedConcurrency, settings.Concurrency, "Concurrency field has wrong value")
 	})
 }
 

internal/config/testdata/asdfrc

@@ -5,6 +5,7 @@ use_release_candidates = yes
 always_keep_download = yes
 plugin_repository_last_check_duration = never
 disable_plugin_short_name_repository = yes
+concurrency = 5
 
 # Hooks
 pre_asdf_plugin_add = echo Executing with args: $@

internal/versions/versions.go

@@ -160,12 +160,13 @@ func InstallOneVersion(conf config.Config, plugin plugins.Plugin, versionStr str
 		return VersionAlreadyInstalledError{version: version, toolName: plugin.Name}
 	}
 
+	concurrency, _ := conf.Concurrency()
 	env := map[string]string{
 		"ASDF_INSTALL_TYPE":    version.Type,
 		"ASDF_INSTALL_VERSION": version.Value,
 		"ASDF_INSTALL_PATH":    installDir,
 		"ASDF_DOWNLOAD_PATH":   downloadDir,
-		"ASDF_CONCURRENCY":     asdfConcurrency(conf),
+		"ASDF_CONCURRENCY":     concurrency,
 	}
 
 	err = os.MkdirAll(downloadDir, 0o777)
@@ -227,21 +228,6 @@ func InstallOneVersion(conf config.Config, plugin plugins.Plugin, versionStr str
 	return nil
 }
 
-func asdfConcurrency(conf config.Config) string {
-	val, ok := os.LookupEnv("ASDF_CONCURRENCY")
-
-	if !ok {
-		val, err := conf.Concurrency()
-		if err != nil {
-			return "1"
-		}
-
-		return val
-	}
-
-	return val
-}
-
 // Latest invokes the plugin's latest-stable callback if it exists and returns
 // the version it returns. If the callback is missing it invokes the list-all
 // callback and returns the last version matching the query, if a query is