fix spelling & lint

Signed-off-by: Denis Vaumoron <[email protected]>
tofuutils · Dec 22, 2024 · e847d35 · e847d35
1 parent 7e4b7ea
commit e847d35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/versionmanager/semantic/parser/asdf/asdfparser.go b/versionmanager/semantic/parser/asdf/asdfparser.go
@@ -60,10 +60,10 @@ func retrieveVersionFromToolFile(filePath, toolName string, conf *config.Config)
 	}
 	defer file.Close()
 
-	return parseVersionFromToolFileReader(filePath, file, toolName, conf.Displayer)
+	return parseVersionFromToolFileReader(filePath, file, toolName, conf.Displayer), nil
 }
 
-func parseVersionFromToolFileReader(filePath string, reader io.Reader, toolName string, displayer loghelper.Displayer) (string, error) {
+func parseVersionFromToolFileReader(filePath string, reader io.Reader, toolName string, displayer loghelper.Displayer) string {
 	resolvedVersion := ""
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
@@ -75,19 +75,19 @@ func parseVersionFromToolFileReader(filePath string, reader io.Reader, toolName
 
 		parts := strings.Fields(trimmedLine)
 		if len(parts) >= 2 && parts[0] == toolName {
-			resolvedVersion, _, _ = strings.Cut(parts[1], "#") // handle comment no separeted by space
+			resolvedVersion, _, _ = strings.Cut(parts[1], "#") // handle comment no separated by space
 		}
 	}
 
 	if err := scanner.Err(); err != nil {
 		displayer.Log(hclog.Warn, "Failed to parse tool file", loghelper.Error, err)
 
-		return "", nil
+		return ""
 	}
 
 	if resolvedVersion == "" {
-		return "", nil
+		return ""
 	}
 
-	return types.DisplayDetectionInfo(displayer, resolvedVersion, filePath), nil
+	return types.DisplayDetectionInfo(displayer, resolvedVersion, filePath)
 }
diff --git a/versionmanager/semantic/parser/asdf/asdfparser_test.go b/versionmanager/semantic/parser/asdf/asdfparser_test.go
@@ -33,33 +33,27 @@ func TestParseVersionFromToolFileReader(t *testing.T) {
 	t.Parallel()
 
 	t.Run("BasicLine", func(t *testing.T) {
-		version, err := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "nodejs", loghelper.InertDisplayer)
-		if err != nil {
-			t.Fatal("Unexpected parse error : ", err)
-		}
+		t.Parallel()
 
+		version := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "nodejs", loghelper.InertDisplayer)
 		if version != "10.15.0" {
 			t.Fatal("Unexpected version : ", version)
 		}
 	})
 
 	t.Run("LineWithComment", func(t *testing.T) {
-		version, err := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "ruby", loghelper.InertDisplayer)
-		if err != nil {
-			t.Fatal("Unexpected parse error : ", err)
-		}
+		t.Parallel()
 
+		version := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "ruby", loghelper.InertDisplayer)
 		if version != "2.5.3" {
 			t.Fatal("Unexpected version : ", version)
 		}
 	})
 
 	t.Run("LineFallback", func(t *testing.T) {
-		version, err := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "python", loghelper.InertDisplayer)
-		if err != nil {
-			t.Fatal("Unexpected parse error : ", err)
-		}
+		t.Parallel()
 
+		version := parseVersionFromToolFileReader("", bytes.NewReader(toolFileData), "python", loghelper.InertDisplayer)
 		if version != "3.7.2" {
 			t.Fatal("Unexpected version : ", version)
 		}