Merge pull request #539 from railgun-0402/feat/no-fallback-detect

feat(detect): add --no-fallback option

Author: kvendingoldo

cmd/tenv/subcmd.go

@@ -78,6 +78,7 @@ func newDetectCmd(versionManager versionmanager.VersionManager, params subCmdPar
 
 	skipSum, skipSign := false, false
 	forceInstall, forceNoInstall := false, false
+	noFallback := false
 
 	detectCmd := &cobra.Command{
 		Use:          "detect",
@@ -89,8 +90,13 @@ func newDetectCmd(versionManager versionmanager.VersionManager, params subCmdPar
 			conf.InitDisplayer(false)
 			conf.InitInstall(forceInstall, forceNoInstall)
 
-			detectedVersion, err := versionManager.Detect(context.Background(), false)
+			detectedVersion, err := versionManager.Detect(context.Background(), false, noFallback)
 			if err != nil {
+				if errors.Is(err, versionmanager.ErrNoVersionFilesFound) {
+					loghelper.StdDisplay(loghelper.Concat("No version files found for ", versionManager.FolderName))
+
+					return err
+				}
 				if !errors.Is(err, versionmanager.ErrNoCompatibleLocally) {
 					return err
 				}
@@ -106,6 +112,7 @@ func newDetectCmd(versionManager versionmanager.VersionManager, params subCmdPar
 	addInstallationFlags(flags, conf, params, &skipSum, &skipSign)
 	addOptionalInstallationFlags(flags, conf, params, &forceInstall, &forceNoInstall)
 	addRemoteFlags(flags, conf, params)
+	flags.BoolVar(&noFallback, "no-fallback", false, "fail if no version files are found instead of using fallback strategy")
 
 	return detectCmd
 }

versionmanager/manager.go

@@ -48,6 +48,7 @@ var (
 	errEmptyVersion        = errors.New("empty version")
 	errNoCompatible        = errors.New("no compatible version found")
 	ErrNoCompatibleLocally = errors.New("no compatible version found locally")
+	ErrNoVersionFilesFound = errors.New("no version files found")
 )
 
 type ReleaseRetriever interface {
@@ -74,8 +75,15 @@ func Make(conf *config.Config, envPrefix string, folderName string, iacExts []ia
 }
 
 // Detect version (resolve and evaluate, can install depending on auto install env var).
-func (m VersionManager) Detect(ctx context.Context, proxyCall bool) (string, error) {
-	configVersion, err := m.Resolve(semantic.LatestAllowedKey)
+// When noFallback is true, returns ErrNoVersionFilesFound if no version files are found instead of using fallback strategy.
+func (m VersionManager) Detect(ctx context.Context, proxyCall bool, noFallback bool) (string, error) {
+	var configVersion string
+	var err error
+	if noFallback {
+		configVersion, err = m.ResolveStrict()
+	} else {
+		configVersion, err = m.Resolve(semantic.LatestAllowedKey)
+	}
 	if err != nil {
 		m.Conf.Displayer.Flush(proxyCall)
 
@@ -292,6 +300,35 @@ func (m VersionManager) Resolve(defaultStrategy string) (string, error) {
 	return defaultStrategy, nil
 }
 
+// ResolveStrict Search the requested version in version files (with fallbacks and env var overloading, but no default strategy fallback).
+// Returns ErrNoVersionFilesFound if no version is found.
+func (m VersionManager) ResolveStrict() (string, error) {
+	versionEnvName := m.EnvNames.Version()
+	version := m.Conf.Getenv(versionEnvName)
+	if version != "" {
+		return types.DisplayDetectionInfo(m.Conf.Displayer, version, versionEnvName), nil
+	}
+
+	version, err := m.ResolveWithVersionFiles()
+	if err != nil {
+		return "", err
+	}
+	if version != "" {
+		return version, nil
+	}
+
+	defaultVersionEnvName := m.EnvNames.defaultVersion()
+	if version = m.Conf.Getenv(defaultVersionEnvName); version != "" {
+		return types.DisplayDetectionInfo(m.Conf.Displayer, version, defaultVersionEnvName), nil
+	}
+
+	if version, err = flatparser.RetrieveVersion(m.RootVersionFilePath(), m.Conf); err != nil || version != "" {
+		return version, err
+	}
+
+	return "", ErrNoVersionFilesFound
+}
+
 // Search the requested version in version files.
 func (m VersionManager) ResolveWithVersionFiles() (string, error) {
 	return semantic.RetrieveVersion(m.VersionFiles, m.Conf)

versionmanager/proxy/proxy.go

@@ -45,7 +45,7 @@ func Exec(conf *config.Config, builderFunc builder.Func, hclParser *hclparse.Par
 	updateWorkPath(conf, cmdArgs)
 
 	ctx := context.Background()
-	detectedVersion, err := versionManager.Detect(ctx, true)
+	detectedVersion, err := versionManager.Detect(ctx, true, false)
 	if err != nil {
 		fmt.Println("Failed to detect a version allowing to call", execName, ":", err) //nolint
 		os.Exit(cmdconst.EarlyErrorExitCode)

versionmanager/tenvlib/lib.go

@@ -179,7 +179,7 @@ func (t Tenv) Detect(ctx context.Context, toolName string) (string, error) {
 		return "", err
 	}
 
-	return t.managers[toolName].Detect(ctx, false)
+	return t.managers[toolName].Detect(ctx, false, false)
 }
 
 // Use the result of Tenv.Detect to call Tenv.Command.