A bunch of linting and refactorings (#1893)

2 files changed, 5 insertions, 9 deletions

diff --git a/version/gen/vgen.go b/version/gen/vgen.go
index 25df7e1e..4528b2d7 100644
--- a/version/gen/vgen.go
+++ b/version/gen/vgen.go
@@ -22,10 +22,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	ver, err := version(descVer, latest)
-	if err != nil {
-		log.Fatal(err)
-	}
+	ver := version(descVer, latest)
 
 	fmt.Println(ver.String())
 }
@@ -44,7 +41,7 @@ func describedVersion() (*semver.Version, error) {
 	return ver, nil
 }
 
-func version(descVer, latest *semver.Version) (*semver.Version, error) {
+func version(descVer, latest *semver.Version) *semver.Version {
 	ver := *descVer
 	if ver.Prerelease() != "" {
 		ver = ver.IncPatch().IncPatch()
@@ -57,7 +54,7 @@ func version(descVer, latest *semver.Version) (*semver.Version, error) {
 
 	// if we're on a release tag already, we're done
 	if descVer.Equal(&ver) {
-		return descVer, nil
+		return descVer
 	}
 
 	// If 'latest' is greater than 'ver', we need to skip to the next patch.
@@ -76,7 +73,7 @@ func version(descVer, latest *semver.Version) (*semver.Version, error) {
 		ver = v
 	}
 
-	return &ver, nil
+	return &ver
 }
 
 func latestTag() (*semver.Version, error) {
diff --git a/version/gen/vgen_test.go b/version/gen/vgen_test.go
index a9c360e6..002475a2 100644
--- a/version/gen/vgen_test.go
+++ b/version/gen/vgen_test.go
@@ -24,8 +24,7 @@ func TestVersion(t *testing.T) {
 			l = semver.MustParse(td.latest)
 		}
 
-		ver, err := version(semver.MustParse(td.desc), l)
-		require.NoError(t, err)
+		ver := version(semver.MustParse(td.desc), l)
 		require.Equal(t, td.expected, ver.String())
 	}
 }