From 8f0f09c0fea0f1a0a3e9f9a41f7a703725befce6 Mon Sep 17 00:00:00 2001
From: Derek McQuay <dmcquay@apprenda.com>
Date: Thu, 5 Jan 2017 14:01:26 -0800
Subject: [PATCH] kubeadm: updated preflight types to avoid stutter

PreFlightError and PreFlightCheck to Error and Checker to avoid
preflight.PreFlightError and preflight.PreFlightCheck stutter.
---
 cmd/kubeadm/app/preflight/checks.go      | 18 +++++++++---------
 cmd/kubeadm/app/preflight/checks_test.go | 10 +++++-----
 cmd/kubeadm/app/util/error.go            |  2 +-
 cmd/kubeadm/app/util/error_test.go       |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go
index 8b4bdecfa53..9cefc0a419d 100644
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -37,17 +37,17 @@ import (
 
 const bridgenf string = "/proc/sys/net/bridge/bridge-nf-call-iptables"
 
-type PreFlightError struct {
+type Error struct {
 	Msg string
 }
 
-func (e *PreFlightError) Error() string {
+func (e *Error) Error() string {
 	return fmt.Sprintf("[preflight] Some fatal errors occurred:\n%s%s", e.Msg, "[preflight] If you know what you are doing, you can skip pre-flight checks with `--skip-preflight-checks`")
 }
 
-// PreFlightCheck validates the state of the system to ensure kubeadm will be
+// Checker validates the state of the system to ensure kubeadm will be
 // successful as often as possilble.
-type PreFlightCheck interface {
+type Checker interface {
 	Check() (warnings, errors []error)
 }
 
@@ -304,7 +304,7 @@ func (sysver SystemVerificationCheck) Check() (warnings, errors []error) {
 }
 
 func RunInitMasterChecks(cfg *kubeadmapi.MasterConfiguration) error {
-	checks := []PreFlightCheck{
+	checks := []Checker{
 		SystemVerificationCheck{},
 		IsRootCheck{},
 		HostnameCheck{},
@@ -346,7 +346,7 @@ func RunInitMasterChecks(cfg *kubeadmapi.MasterConfiguration) error {
 }
 
 func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error {
-	checks := []PreFlightCheck{
+	checks := []Checker{
 		SystemVerificationCheck{},
 		IsRootCheck{},
 		HostnameCheck{},
@@ -372,7 +372,7 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error {
 }
 
 func RunRootCheckOnly() error {
-	checks := []PreFlightCheck{
+	checks := []Checker{
 		IsRootCheck{},
 	}
 
@@ -381,7 +381,7 @@ func RunRootCheckOnly() error {
 
 // RunChecks runs each check, displays it's warnings/errors, and once all
 // are processed will exit if any errors occurred.
-func RunChecks(checks []PreFlightCheck, ww io.Writer) error {
+func RunChecks(checks []Checker, ww io.Writer) error {
 	found := []error{}
 	for _, c := range checks {
 		warnings, errs := c.Check()
@@ -395,7 +395,7 @@ func RunChecks(checks []PreFlightCheck, ww io.Writer) error {
 		for _, i := range found {
 			errs.WriteString("\t" + i.Error() + "\n")
 		}
-		return &PreFlightError{Msg: errs.String()}
+		return &Error{Msg: errs.String()}
 	}
 	return nil
 }
diff --git a/cmd/kubeadm/app/preflight/checks_test.go b/cmd/kubeadm/app/preflight/checks_test.go
index d99a891a123..569d0595651 100644
--- a/cmd/kubeadm/app/preflight/checks_test.go
+++ b/cmd/kubeadm/app/preflight/checks_test.go
@@ -38,14 +38,14 @@ func (pfct preflightCheckTest) Check() (warning, errors []error) {
 
 func TestRunChecks(t *testing.T) {
 	var tokenTest = []struct {
-		p        []PreFlightCheck
+		p        []Checker
 		expected bool
 		output   string
 	}{
-		{[]PreFlightCheck{}, true, ""},
-		{[]PreFlightCheck{preflightCheckTest{"warning"}}, true, "[preflight] WARNING: warning\n"}, // should just print warning
-		{[]PreFlightCheck{preflightCheckTest{"error"}}, false, ""},
-		{[]PreFlightCheck{preflightCheckTest{"test"}}, false, ""},
+		{[]Checker{}, true, ""},
+		{[]Checker{preflightCheckTest{"warning"}}, true, "[preflight] WARNING: warning\n"}, // should just print warning
+		{[]Checker{preflightCheckTest{"error"}}, false, ""},
+		{[]Checker{preflightCheckTest{"test"}}, false, ""},
 	}
 	for _, rt := range tokenTest {
 		buf := new(bytes.Buffer)
diff --git a/cmd/kubeadm/app/util/error.go b/cmd/kubeadm/app/util/error.go
index 6c3cfc6f68d..479c7cead48 100644
--- a/cmd/kubeadm/app/util/error.go
+++ b/cmd/kubeadm/app/util/error.go
@@ -61,7 +61,7 @@ func checkErr(prefix string, err error, handleErr func(string, int)) {
 	switch err.(type) {
 	case nil:
 		return
-	case *preflight.PreFlightError:
+	case *preflight.Error:
 		handleErr(err.Error(), PreFlightExitCode)
 	default:
 		handleErr(err.Error(), DefaultErrorExitCode)
diff --git a/cmd/kubeadm/app/util/error_test.go b/cmd/kubeadm/app/util/error_test.go
index a94a4629e6a..07aae6c3357 100644
--- a/cmd/kubeadm/app/util/error_test.go
+++ b/cmd/kubeadm/app/util/error_test.go
@@ -35,7 +35,7 @@ func TestCheckErr(t *testing.T) {
 	}{
 		{nil, 0},
 		{fmt.Errorf(""), DefaultErrorExitCode},
-		{&preflight.PreFlightError{}, PreFlightExitCode},
+		{&preflight.Error{}, PreFlightExitCode},
 	}
 
 	for _, rt := range tokenTest {