removed get prefix from funcs

Author: spowelljr

cmd/minikube/cmd/update-check.go

@@ -31,7 +31,7 @@ var updateCheckCmd = &cobra.Command{
 	Long:  `Print current and latest version number`,
 	Run: func(command *cobra.Command, args []string) {
 		url := notify.GithubMinikubeReleasesURL
-		r, err := notify.GetAllVersionsFromURL(url)
+		r, err := notify.AllVersionsFromURL(url)
 		if err != nil {
 			exit.Error(reason.InetVersionUnavailable, "Unable to fetch latest version info", err)
 		}

pkg/minikube/notify/notify.go

@@ -51,7 +51,7 @@ func maybePrintUpdateText(latestReleasesURL string, betaReleasesURL string, last
 	if !shouldCheckURLVersion(lastUpdatePath) {
 		return
 	}
-	latestVersion, err := getLatestVersionFromURL(latestReleasesURL)
+	latestVersion, err := latestVersionFromURL(latestReleasesURL)
 	if err != nil {
 		klog.Warning(err)
 		return
@@ -75,7 +75,7 @@ func maybePrintBetaUpdateText(betaReleasesURL string, localVersion semver.Versio
 	if !shouldCheckURLBetaVersion(lastUpdatePath) {
 		return false
 	}
-	latestBetaVersion, err := getLatestVersionFromURL(betaReleasesURL)
+	latestBetaVersion, err := latestVersionFromURL(betaReleasesURL)
 	if err != nil {
 		klog.Warning(err)
 		return false
@@ -113,7 +113,7 @@ func shouldCheckURLVersion(filePath string) bool {
 	if !viper.GetBool(config.WantUpdateNotification) {
 		return false
 	}
-	lastUpdateTime := getTimeFromFileIfExists(filePath)
+	lastUpdateTime := timeFromFileIfExists(filePath)
 	return time.Since(lastUpdateTime).Hours() >= viper.GetFloat64(config.ReminderWaitPeriodInHours)
 }
 
@@ -155,16 +155,16 @@ func getJSON(url string, target *Releases) error {
 	return json.NewDecoder(resp.Body).Decode(target)
 }
 
-var getLatestVersionFromURL = func(url string) (semver.Version, error) {
-	r, err := GetAllVersionsFromURL(url)
+var latestVersionFromURL = func(url string) (semver.Version, error) {
+	r, err := AllVersionsFromURL(url)
 	if err != nil {
 		return semver.Version{}, err
 	}
 	return semver.Make(strings.TrimPrefix(r[0].Name, version.VersionPrefix))
 }
 
-// GetAllVersionsFromURL get all versions from a JSON URL
-func GetAllVersionsFromURL(url string) (Releases, error) {
+// AllVersionsFromURL get all versions from a JSON URL
+func AllVersionsFromURL(url string) (Releases, error) {
 	var releases Releases
 	klog.Info("Checking for updates...")
 	if err := getJSON(url, &releases); err != nil {
@@ -184,7 +184,7 @@ func writeTimeToFile(path string, inputTime time.Time) error {
 	return nil
 }
 
-func getTimeFromFileIfExists(path string) time.Time {
+func timeFromFileIfExists(path string) time.Time {
 	lastUpdateCheckTime, err := ioutil.ReadFile(path)
 	if err != nil {
 		return time.Time{}

pkg/minikube/notify/notify_test.go

@@ -113,19 +113,19 @@ func (h *URLHandlerCorrect) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func TestGetLatestVersionFromURLCorrect(t *testing.T) {
+func TestLatestVersionFromURLCorrect(t *testing.T) {
 	// test that the version is correctly parsed if returned if valid JSON is returned the url endpoint
-	latestVersionFromURL := "0.0.0-dev"
+	versionFromURL := "0.0.0-dev"
 	handler := &URLHandlerCorrect{
-		releases: []Release{{Name: version.VersionPrefix + latestVersionFromURL}},
+		releases: []Release{{Name: version.VersionPrefix + versionFromURL}},
 	}
 	server := httptest.NewServer(handler)
 
-	latestVersion, err := getLatestVersionFromURL(server.URL)
+	latestVersion, err := latestVersionFromURL(server.URL)
 	if err != nil {
 		t.Fatalf(err.Error())
 	}
-	expectedVersion, _ := semver.Make(latestVersionFromURL)
+	expectedVersion, _ := semver.Make(versionFromURL)
 	if latestVersion.Compare(expectedVersion) != 0 {
 		t.Fatalf("Expected latest version from URL to be %s, it was instead %s", expectedVersion, latestVersion)
 	}
@@ -136,12 +136,12 @@ type URLHandlerNone struct{}
 func (h *URLHandlerNone) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
-func TestGetLatestVersionFromURLNone(t *testing.T) {
+func TestLatestVersionFromURLNone(t *testing.T) {
 	// test that an error is returned if nothing is returned at the url endpoint
 	handler := &URLHandlerNone{}
 	server := httptest.NewServer(handler)
 
-	_, err := getLatestVersionFromURL(server.URL)
+	_, err := latestVersionFromURL(server.URL)
 	if err == nil {
 		t.Fatalf("No version value was returned from URL but no error was thrown")
 	}
@@ -154,21 +154,21 @@ func (h *URLHandlerMalformed) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	fmt.Fprintf(w, "Malformed JSON")
 }
 
-func TestGetLatestVersionFromURLMalformed(t *testing.T) {
+func TestLatestVersionFromURLMalformed(t *testing.T) {
 	// test that an error is returned if malformed JSON is at the url endpoint
 	handler := &URLHandlerMalformed{}
 	server := httptest.NewServer(handler)
 
-	_, err := getLatestVersionFromURL(server.URL)
+	_, err := latestVersionFromURL(server.URL)
 	if err == nil {
 		t.Fatalf("Malformed version value was returned from URL but no error was thrown")
 	}
 }
 
-var mockGetLatestVersionFromURL = semver.Make
+var mockLatestVersionFromURL = semver.Make
 
 func TestMaybePrintUpdateText(t *testing.T) {
-	getLatestVersionFromURL = mockGetLatestVersionFromURL
+	latestVersionFromURL = mockLatestVersionFromURL
 
 	tempDir := tests.MakeTempDir()
 	defer tests.RemoveTempDir(tempDir)