add --skip-version-check flag (#314)

* don't prompt to upgrade if running currentVersion-next

When compiling from the latest source code, osdctl would prompt the user
to upgrade to the latest version because it automatically appends
"-next" during compilation. Since the latest commit in the master branch
is newer than the latest tagged build, osdctl shouldn't prompt the user
to downgrade.

* remove dead code

* add an option to skip the latest-released-version check

The check was moved out of main() and into a PersistentPreRun hook on
the root command to take advantage of cobra argument parsing and keep
main() strictly for setting up and executing the command

Author: yithian

cmd/cmd.go

@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"strings"
 
 	routev1 "github.com/openshift/api/route/v1"
 	awsv1alpha1 "github.com/openshift/aws-account-operator/api/v1alpha1"
@@ -26,6 +28,7 @@ import (
 	"github.com/openshift/osdctl/cmd/sts"
 	"github.com/openshift/osdctl/internal/utils/globalflags"
 	"github.com/openshift/osdctl/pkg/k8s"
+	"github.com/openshift/osdctl/pkg/utils"
 )
 
 func init() {
@@ -43,6 +46,43 @@ func NewCmdRoot(streams genericclioptions.IOStreams) *cobra.Command {
 		Short:             "OSD CLI",
 		Long:              `CLI tool to provide OSD related utilities`,
 		DisableAutoGenTag: true,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			skipVersionCheck, err := cmd.Flags().GetBool("skip-version-check")
+			if err != nil {
+				fmt.Println("flag --skip-version-check/-S undefined")
+				os.Exit(1)
+			}
+
+			if !skipVersionCheck {
+				latestVersion, err := utils.GetLatestVersion()
+				if err != nil {
+					fmt.Println("Warning: Unable to verify that osdctl is running under the latest released version. Error trying to reach GitHub:")
+					fmt.Println(err)
+					fmt.Println("Please be aware that you are possibly running an outdated or unreleased version.")
+
+					// Version query failed, so we just assume that the version didn't change
+					latestVersion = utils.Version
+				}
+
+				if utils.Version != latestVersion {
+					fmt.Println("The current version is different than the latest released version.")
+					fmt.Println("It is recommended that you update to the latest released version to ensure that no known bugs or issues are hit.")
+					fmt.Println("Please confirm that you would like to continue with [y|n]")
+
+					var input string
+					for {
+						fmt.Scanln(&input)
+						if strings.ToLower(input) == "y" {
+							break
+						}
+						if strings.ToLower(input) == "n" {
+							fmt.Println("Exiting")
+							os.Exit(0)
+						}
+					}
+				}
+			}
+		},
 	}
 
 	globalflags.AddGlobalFlags(rootCmd, globalOpts)

internal/utils/globalflags/globalflags.go

@@ -10,13 +10,15 @@ import (
 
 // GlobalOptions defines all available commands
 type GlobalOptions struct {
-	Output string
+	Output           string
+	SkipVersionCheck bool
 }
 
 // AddGlobalFlags adds the Global Flags to the root command
 func AddGlobalFlags(cmd *cobra.Command, opts *GlobalOptions) {
 	cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
 	cmd.PersistentFlags().StringVarP(&opts.Output, "output", "o", "", "Valid formats are ['', 'json', 'yaml', 'env']")
+	cmd.PersistentFlags().BoolVarP(&opts.SkipVersionCheck, "skip-version-check", "S", false, "skip checking to see if this is the most recent release")
 }
 
 // GetFlags adds the kubeFlags we care about and adds the flags from the provided command

main.go

@@ -1,15 +1,11 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/openshift/osdctl/cmd"
 	"github.com/openshift/osdctl/pkg/osdctlConfig"
-	"github.com/openshift/osdctl/pkg/utils"
-	"github.com/spf13/pflag"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
@@ -22,43 +18,6 @@ func main() {
 		return
 	}
 
-	latestVersion, err := utils.GetLatestVersion()
-	if err != nil {
-		fmt.Println("Warning: Unable to verify that osdctl is running under the latest version. Error trying to reach GitHub:")
-		fmt.Println(err)
-		fmt.Println("Please be aware that you are possibly running an outdated version.")
-
-		// Version query failed, so we just assume that the version didn't change
-		latestVersion = utils.Version
-	}
-
-	if utils.Version != latestVersion {
-		fmt.Println("The current version is different than the latest version.")
-		fmt.Println("It is recommended that you update to the latest version to ensure that no known bugs or issues are hit.")
-		fmt.Println("Please confirm that you would like to continue with [y|n]")
-
-		var input string
-		for {
-			fmt.Scanln(&input)
-			if strings.ToLower(input) == "y" {
-				break
-			}
-			if strings.ToLower(input) == "n" {
-				fmt.Println("Exiting")
-				return
-			}
-			fmt.Println("Input not recognized. Please select [y|n]")
-		}
-	}
-
-	flags := pflag.NewFlagSet("osdctl", pflag.ExitOnError)
-	err = flag.CommandLine.Parse([]string{})
-	if err != nil {
-		fmt.Println("Error parsing commandline flags: ", err.Error())
-		return
-	}
-	pflag.CommandLine = flags
-
 	command := cmd.NewCmdRoot(genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr})
 
 	if err := command.Execute(); err != nil {