notify: Remove viper interactive checks

The notify helpers accept now *run.CommandOptions and use it to check if
we can interact with the user. Modify callers to pass options using
cmd/flags.CommandOptions().

Author: nirs

cmd/minikube/cmd/config/profile_list.go

@@ -57,7 +57,7 @@ var profileListCmd = &cobra.Command{
 		options := flags.CommandOptions()
 		output := strings.ToLower(profileOutput)
 		out.SetJSON(output == "json")
-		go notify.MaybePrintUpdateTextFromGithub()
+		go notify.MaybePrintUpdateTextFromGithub(options)
 
 		switch output {
 		case "json":

cmd/minikube/cmd/start.go

@@ -170,7 +170,7 @@ func runStart(cmd *cobra.Command, _ []string) {
 	go download.CleanUpOlderPreloads()
 
 	// Avoid blocking execution on optional HTTP fetches
-	go notify.MaybePrintUpdateTextFromGithub()
+	go notify.MaybePrintUpdateTextFromGithub(options)
 
 	displayEnviron(os.Environ())
 	if viper.GetBool(force) {

cmd/minikube/cmd/status.go

@@ -92,7 +92,7 @@ var statusCmd = &cobra.Command{
 
 		options := flags.CommandOptions()
 		out.SetJSON(output == "json")
-		go notify.MaybePrintUpdateTextFromGithub()
+		go notify.MaybePrintUpdateTextFromGithub(options)
 
 		cname := ClusterFlagValue()
 		api, cc := mustload.Partial(cname, options)

pkg/minikube/notify/notify.go

@@ -33,6 +33,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/detect"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/run"
 	"k8s.io/minikube/pkg/minikube/style"
 	"k8s.io/minikube/pkg/util/lock"
 	"k8s.io/minikube/pkg/version"
@@ -44,30 +45,30 @@ var (
 )
 
 // MaybePrintUpdateTextFromGithub prints update text if needed, from github
-func MaybePrintUpdateTextFromGithub() {
-	maybePrintUpdateText(GithubMinikubeReleasesURL, GithubMinikubeBetaReleasesURL, lastUpdateCheckFilePath)
+func MaybePrintUpdateTextFromGithub(options *run.CommandOptions) {
+	maybePrintUpdateText(GithubMinikubeReleasesURL, GithubMinikubeBetaReleasesURL, lastUpdateCheckFilePath, options)
 }
 
 // MaybePrintUpdateTextFromAliyunMirror prints update text if needed, from Aliyun mirror
-func MaybePrintUpdateTextFromAliyunMirror() {
-	maybePrintUpdateText(GithubMinikubeReleasesAliyunURL, GithubMinikubeBetaReleasesAliyunURL, lastUpdateCheckFilePath)
+func MaybePrintUpdateTextFromAliyunMirror(options *run.CommandOptions) {
+	maybePrintUpdateText(GithubMinikubeReleasesAliyunURL, GithubMinikubeBetaReleasesAliyunURL, lastUpdateCheckFilePath, options)
 }
 
-func maybePrintUpdateText(latestReleasesURL string, betaReleasesURL string, lastUpdatePath string) {
+func maybePrintUpdateText(latestReleasesURL string, betaReleasesURL string, lastUpdatePath string, options *run.CommandOptions) {
 	latestVersion, err := latestVersionFromURL(latestReleasesURL)
 	if err != nil {
 		klog.Warning(err)
 		return
 	}
-	if !shouldCheckURLVersion(lastUpdatePath) {
+	if !shouldCheckURLVersion(lastUpdatePath, options) {
 		return
 	}
 	localVersion, err := version.GetSemverVersion()
 	if err != nil {
 		klog.Warning(err)
 		return
 	}
-	if maybePrintBetaUpdateText(betaReleasesURL, localVersion, latestVersion, lastUpdatePath) {
+	if maybePrintBetaUpdateText(betaReleasesURL, localVersion, latestVersion, lastUpdatePath, options) {
 		return
 	}
 	if localVersion.Compare(latestVersion) >= 0 {
@@ -77,8 +78,8 @@ func maybePrintUpdateText(latestReleasesURL string, betaReleasesURL string, last
 }
 
 // maybePrintBetaUpdateText returns true if update text is printed
-func maybePrintBetaUpdateText(betaReleasesURL string, localVersion semver.Version, latestFullVersion semver.Version, lastUpdatePath string) bool {
-	if !shouldCheckURLBetaVersion(lastUpdatePath) {
+func maybePrintBetaUpdateText(betaReleasesURL string, localVersion semver.Version, latestFullVersion semver.Version, lastUpdatePath string, options *run.CommandOptions) bool {
+	if !shouldCheckURLBetaVersion(lastUpdatePath, options) {
 		return false
 	}
 	latestBetaVersion, err := latestVersionFromURL(betaReleasesURL)
@@ -115,11 +116,11 @@ func printBetaUpdateText(ver semver.Version) {
 	out.Styled(style.Tip, "To disable update notices in general, run: 'minikube config set WantUpdateNotification false'\n")
 }
 
-func shouldCheckURLVersion(filePath string) bool {
+func shouldCheckURLVersion(filePath string, options *run.CommandOptions) bool {
 	if !viper.GetBool(config.WantUpdateNotification) {
 		return false
 	}
-	if !viper.GetBool("interactive") {
+	if options.NonInteractive {
 		return false
 	}
 	if out.JSON {
@@ -129,12 +130,12 @@ func shouldCheckURLVersion(filePath string) bool {
 	return time.Since(lastUpdateTime).Hours() >= viper.GetFloat64(config.ReminderWaitPeriodInHours)
 }
 
-func shouldCheckURLBetaVersion(filePath string) bool {
+func shouldCheckURLBetaVersion(filePath string, options *run.CommandOptions) bool {
 	if !viper.GetBool(config.WantBetaUpdateNotification) {
 		return false
 	}
 
-	return shouldCheckURLVersion(filePath)
+	return shouldCheckURLVersion(filePath, options)
 }
 
 type operatingSystems struct {

pkg/minikube/notify/notify_test.go

@@ -31,25 +31,25 @@ import (
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/run"
 	"k8s.io/minikube/pkg/minikube/tests"
 	"k8s.io/minikube/pkg/version"
 )
 
 func TestShouldCheckURLVersion(t *testing.T) {
-	viper.Set("interactive", true)
 	tempDir := tests.MakeTempDir(t)
 
 	lastUpdateCheckFilePath := filepath.Join(tempDir, "last_update_check")
 
 	// test that if users disable update notification in config, the URL version does not get checked
 	viper.Set(config.WantUpdateNotification, false)
-	if shouldCheckURLVersion(lastUpdateCheckFilePath) {
+	if shouldCheckURLVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLVersion returned true even though config had WantUpdateNotification: false")
 	}
 
 	// test that if users want update notification, the URL version does get checked
 	viper.Set(config.WantUpdateNotification, true)
-	if !shouldCheckURLVersion(lastUpdateCheckFilePath) {
+	if !shouldCheckURLVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLVersion returned false even though there was no last_update_check file")
 	}
 
@@ -60,15 +60,15 @@ func TestShouldCheckURLVersion(t *testing.T) {
 	if err := writeTimeToFile(lastUpdateCheckFilePath, time.Time{}); err != nil {
 		t.Errorf("write failed: %v", err)
 	}
-	if !shouldCheckURLVersion(lastUpdateCheckFilePath) {
+	if !shouldCheckURLVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLVersion returned false even though longer than 24 hours since last update")
 	}
 
 	// test that update notifications do not get triggered if it has been less than 24 hours
 	if err := writeTimeToFile(lastUpdateCheckFilePath, time.Now().UTC()); err != nil {
 		t.Errorf("write failed: %v", err)
 	}
-	if shouldCheckURLVersion(lastUpdateCheckFilePath) {
+	if shouldCheckURLVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLVersion returned true even though less than 24 hours since last update")
 	}
 
@@ -83,13 +83,13 @@ func TestShouldCheckURLBetaVersion(t *testing.T) {
 
 	// test if the user disables beta update notification in config, the URL version does not get checked
 	viper.Set(config.WantBetaUpdateNotification, false)
-	if shouldCheckURLBetaVersion(lastUpdateCheckFilePath) {
+	if shouldCheckURLBetaVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLBetaVersion returned true even though config had WantBetaUpdateNotification: false")
 	}
 
 	// test if the user enables beta update notification in config, the URL version does get checked
 	viper.Set(config.WantBetaUpdateNotification, true)
-	if !shouldCheckURLBetaVersion(lastUpdateCheckFilePath) {
+	if !shouldCheckURLBetaVersion(lastUpdateCheckFilePath, &run.CommandOptions{}) {
 		t.Fatalf("shouldCheckURLBetaVersion returned false even though config had WantBetaUpdateNotification: true")
 	}
 }
@@ -227,7 +227,7 @@ func TestMaybePrintUpdateText(t *testing.T) {
 			}
 			defer os.Remove(tmpfile.Name())
 
-			maybePrintUpdateText(tt.latestFullVersionFromURL, tt.latestBetaVersionFromURL, tmpfile.Name())
+			maybePrintUpdateText(tt.latestFullVersionFromURL, tt.latestBetaVersionFromURL, tmpfile.Name(), &run.CommandOptions{})
 			got := outputBuffer.String()
 			if (tt.want == "" && len(got) != 0) || (tt.want != "" && !strings.Contains(got, tt.want)) {
 				t.Fatalf("Expected MaybePrintUpdateText to contain the text %q as the current version is %s and full version %s and beta version %s, but output was [%s]",