Issue minishift#2074 Refactor naming around openshift checks

hferentschik · Mar 2, 2018 · a58d643 · a58d643
1 parent 198eba5
commit a58d643
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/cmd/minishift/cmd/config/config.go b/cmd/minishift/cmd/config/config.go
@@ -101,22 +101,22 @@ var (
 	CacheImages  = createConfigSetting("cache-images", SetSlice, nil, nil, false, nil)
 
 	// Pre-flight checks (before start)
-	SkipCheckKVMDriver              = createConfigSetting("skip-check-kvm-driver", SetBool, nil, nil, true, nil)
-	WarnCheckKVMDriver              = createConfigSetting("warn-check-kvm-driver", SetBool, nil, nil, true, false)
-	SkipCheckXHyveDriver            = createConfigSetting("skip-check-xhyve-driver", SetBool, nil, nil, true, nil)
-	WarnCheckXHyveDriver            = createConfigSetting("warn-check-xhyve-driver", SetBool, nil, nil, true, false)
-	SkipCheckHyperVDriver           = createConfigSetting("skip-check-hyperv-driver", SetBool, nil, nil, true, nil)
-	WarnCheckHyperVDriver           = createConfigSetting("warn-check-hyperv-driver", SetBool, nil, nil, true, false)
-	SkipCheckIsoUrl                 = createConfigSetting("skip-check-iso-url", SetBool, nil, nil, true, nil)
-	WarnCheckIsoUrl                 = createConfigSetting("warn-check-iso-url", SetBool, nil, nil, true, false)
-	SkipCheckVMDriver               = createConfigSetting("skip-check-vm-driver", SetBool, nil, nil, true, nil)
-	WarnCheckVMDriver               = createConfigSetting("warn-check-vm-driver", SetBool, nil, nil, true, false)
-	SkipCheckVBoxInstalled          = createConfigSetting("skip-check-vbox-installed", SetBool, nil, nil, true, nil)
-	WarnCheckVBoxInstalled          = createConfigSetting("warn-check-vbox-installed", SetBool, nil, nil, true, false)
-	SkipCheckOpenShiftVersion       = createConfigSetting("skip-check-openshift-version", SetBool, nil, nil, true, nil)
-	WarnCheckOpenShiftVersion       = createConfigSetting("warn-check-openshift-version", SetBool, nil, nil, true, false)
-	SkipCheckOpenShiftGithubRelease = createConfigSetting("skip-check-openshift-github-release", SetBool, nil, nil, true, nil)
-	WarnCheckOpenShiftGithubRelease = createConfigSetting("warn-check-openshift-github-release", SetBool, nil, nil, true, false)
+	SkipCheckKVMDriver        = createConfigSetting("skip-check-kvm-driver", SetBool, nil, nil, true, nil)
+	WarnCheckKVMDriver        = createConfigSetting("warn-check-kvm-driver", SetBool, nil, nil, true, false)
+	SkipCheckXHyveDriver      = createConfigSetting("skip-check-xhyve-driver", SetBool, nil, nil, true, nil)
+	WarnCheckXHyveDriver      = createConfigSetting("warn-check-xhyve-driver", SetBool, nil, nil, true, false)
+	SkipCheckHyperVDriver     = createConfigSetting("skip-check-hyperv-driver", SetBool, nil, nil, true, nil)
+	WarnCheckHyperVDriver     = createConfigSetting("warn-check-hyperv-driver", SetBool, nil, nil, true, false)
+	SkipCheckIsoUrl           = createConfigSetting("skip-check-iso-url", SetBool, nil, nil, true, nil)
+	WarnCheckIsoUrl           = createConfigSetting("warn-check-iso-url", SetBool, nil, nil, true, false)
+	SkipCheckVMDriver         = createConfigSetting("skip-check-vm-driver", SetBool, nil, nil, true, nil)
+	WarnCheckVMDriver         = createConfigSetting("warn-check-vm-driver", SetBool, nil, nil, true, false)
+	SkipCheckVBoxInstalled    = createConfigSetting("skip-check-vbox-installed", SetBool, nil, nil, true, nil)
+	WarnCheckVBoxInstalled    = createConfigSetting("warn-check-vbox-installed", SetBool, nil, nil, true, false)
+	SkipCheckOpenShiftVersion = createConfigSetting("skip-check-openshift-version", SetBool, nil, nil, true, nil)
+	WarnCheckOpenShiftVersion = createConfigSetting("warn-check-openshift-version", SetBool, nil, nil, true, false)
+	SkipCheckOpenShiftRelease = createConfigSetting("skip-check-openshift-release", SetBool, nil, nil, true, nil)
+	WarnCheckOpenShiftRelease = createConfigSetting("warn-check-openshift-release", SetBool, nil, nil, true, false)
 
 	// Pre-flight checks (after start)
 	SkipInstanceIP        = createConfigSetting("skip-check-instance-ip", SetBool, nil, nil, true, nil)

diff --git a/cmd/minishift/cmd/start_preflight.go b/cmd/minishift/cmd/start_preflight.go
@@ -51,11 +51,11 @@ func preflightChecksBeforeStartingHost() {
 	prerequisiteErrorMessage := "See the 'Installing Prerequisites for Minishift' topic (https://docs.openshift.org/latest/minishift/getting-started/installing.html#install-prerequisites) for more information"
 
 	preflightCheckSucceedsOrFails(
-		configCmd.SkipCheckOpenShiftGithubRelease.Name,
-		checkOcTagOnGithub,
-		fmt.Sprintf("Checking if requested OpenShift version '%s' is valid on GitHub", viper.GetString(configCmd.OpenshiftVersion.Name)),
-		configCmd.WarnCheckOpenShiftGithubRelease.Name,
-		fmt.Sprintf("%s is not a valid OpenShift version on GitHub", viper.GetString(configCmd.OpenshiftVersion.Name)),
+		configCmd.SkipCheckOpenShiftRelease.Name,
+		checkOriginRelease,
+		fmt.Sprintf("Checking if requested OpenShift version '%s' is valid", viper.GetString(configCmd.OpenshiftVersion.Name)),
+		configCmd.WarnCheckOpenShiftRelease.Name,
+		fmt.Sprintf("%s is not a valid OpenShift version", viper.GetString(configCmd.OpenshiftVersion.Name)),
 	)
 
 	preflightCheckSucceedsOrFails(
@@ -534,8 +534,8 @@ func validateOpenshiftVersion() bool {
 	return true
 }
 
-// checkOcTagOnGithub return true if specified version of OpenShift released.
-func checkOcTagOnGithub() bool {
+// checkOriginRelease return true if specified version of OpenShift is released
+func checkOriginRelease() bool {
 	client := github.Client()
 	_, _, err := client.Repositories.GetReleaseByTag("openshift", "origin", viper.GetString(configCmd.OpenshiftVersion.Name))
 	if err != nil {