Merge pull request from afbjorklund/golint-cleanup

Do some simple cleanup of the golint complaints
pull/9316/head
priyawadhwa 2020-10-05 10:46:35 -04:00 committed by GitHub
commit f016dbb87f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 49 additions and 6 deletions

View File

@ -57,6 +57,7 @@ var (
const ( const (
// Additional legacy states: // Additional legacy states:
// Configured means configured // Configured means configured
Configured = "Configured" // ~state.Saved Configured = "Configured" // ~state.Saved
// Misconfigured means misconfigured // Misconfigured means misconfigured
@ -67,7 +68,9 @@ const (
Irrelevant = "Irrelevant" Irrelevant = "Irrelevant"
// New status modes, based roughly on HTTP/SMTP standards // New status modes, based roughly on HTTP/SMTP standards
// 1xx signifies a transitional state. If retried, it will soon return a 2xx, 4xx, or 5xx // 1xx signifies a transitional state. If retried, it will soon return a 2xx, 4xx, or 5xx
Starting = 100 Starting = 100
Pausing = 101 Pausing = 101
Unpausing = 102 Unpausing = 102
@ -75,15 +78,18 @@ const (
Deleting = 120 Deleting = 120
// 2xx signifies that the API Server is able to service requests // 2xx signifies that the API Server is able to service requests
OK = 200 OK = 200
Warning = 203 Warning = 203
// 4xx signifies an error that requires help from the client to resolve // 4xx signifies an error that requires help from the client to resolve
NotFound = 404 NotFound = 404
Stopped = 405 Stopped = 405
Paused = 418 // I'm a teapot! Paused = 418 // I'm a teapot!
// 5xx signifies a server-side error (that may be retryable) // 5xx signifies a server-side error (that may be retryable)
Error = 500 Error = 500
InsufficientStorage = 507 InsufficientStorage = 507
Unknown = 520 Unknown = 520

View File

@ -413,6 +413,7 @@ func containerdImagesPreloaded(runner command.Runner, images []string) bool {
return true return true
} }
// ImagesPreloaded returns true if all images have been preloaded
func (r *Containerd) ImagesPreloaded(images []string) bool { func (r *Containerd) ImagesPreloaded(images []string) bool {
return containerdImagesPreloaded(r.Runner, images) return containerdImagesPreloaded(r.Runner, images)
} }

View File

@ -326,6 +326,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool {
return true return true
} }
// ImagesPreloaded returns true if all images have been preloaded
func (r *CRIO) ImagesPreloaded(images []string) bool { func (r *CRIO) ImagesPreloaded(images []string) bool {
return crioImagesPreloaded(r.Runner, images) return crioImagesPreloaded(r.Runner, images)
} }

View File

@ -405,6 +405,7 @@ func dockerBoundToContainerd(runner command.Runner) bool {
return false return false
} }
// ImagesPreloaded returns true if all images have been preloaded
func (r *Docker) ImagesPreloaded(images []string) bool { func (r *Docker) ImagesPreloaded(images []string) bool {
return dockerImagesPreloaded(r.Runner, images) return dockerImagesPreloaded(r.Runner, images)
} }

View File

@ -26,6 +26,7 @@ import (
"k8s.io/minikube/pkg/minikube/out/register" "k8s.io/minikube/pkg/minikube/out/register"
) )
// DefaultJSONOutput is a progress tracker with JSON output
var DefaultJSONOutput getter.ProgressTracker = &jsonOutput{} var DefaultJSONOutput getter.ProgressTracker = &jsonOutput{}
type jsonOutput struct { type jsonOutput struct {

View File

@ -112,7 +112,7 @@ func IsDocker(name string) bool {
return name == Docker return name == Docker
} }
// IsKIC checks if the driver is a Docker for Desktop (Docker on windows or MacOs) // IsDockerDesktop checks if the driver is a Docker for Desktop (Docker on windows or MacOs)
// for linux and exotic archs, this will be false // for linux and exotic archs, this will be false
func IsDockerDesktop(name string) bool { func IsDockerDesktop(name string) bool {
if IsDocker(name) { if IsDocker(name) {

View File

@ -33,7 +33,9 @@ const (
var ( var (
outputFile io.Writer = os.Stdout outputFile io.Writer = os.Stdout
GetUUID = randomID
//GetUUID returns the UUID function to use
GetUUID = randomID
eventFile *os.File eventFile *os.File
) )

View File

@ -110,6 +110,7 @@ type Info struct {
data map[string]string data map[string]string
} }
// Type returns the cloud events compatible type of this struct
func (s *Info) Type() string { func (s *Info) Type() string {
return "io.k8s.sigs.minikube.info" return "io.k8s.sigs.minikube.info"
} }
@ -128,6 +129,7 @@ type Error struct {
data map[string]string data map[string]string
} }
// NewError returns a new Error type
func NewError(err string) *Error { func NewError(err string) *Error {
return &Error{ return &Error{
map[string]string{ map[string]string{
@ -148,6 +150,7 @@ func NewErrorExitCode(err string, exitcode int, additionalData ...map[string]str
return e return e
} }
// Type returns the cloud events compatible type of this struct
func (s *Error) Type() string { func (s *Error) Type() string {
return "io.k8s.sigs.minikube.error" return "io.k8s.sigs.minikube.error"
} }

View File

@ -34,6 +34,7 @@ package reason
const ( const (
// Reserved UNIX exit codes // Reserved UNIX exit codes
ExFailure = 1 // Failure represents a general failure code ExFailure = 1 // Failure represents a general failure code
ExInterrupted = 2 // Ctrl-C (SIGINT) ExInterrupted = 2 // Ctrl-C (SIGINT)
@ -56,6 +57,7 @@ const (
// navailableOff = 9 // (~EX_UNAVAILABLE) // navailableOff = 9 // (~EX_UNAVAILABLE)
// Error codes specific to the minikube program // Error codes specific to the minikube program
ExProgramError = 10 // generic error ExProgramError = 10 // generic error
ExProgramUsage = 14 // bad command-line options ExProgramUsage = 14 // bad command-line options
ExProgramConflict = 11 // can't do what you want because of existing data ExProgramConflict = 11 // can't do what you want because of existing data
@ -64,6 +66,7 @@ const (
ExProgramConfig = 18 // bad configuration specified ExProgramConfig = 18 // bad configuration specified
// Error codes specific to resource limits (exit code layout follows no rules) // Error codes specific to resource limits (exit code layout follows no rules)
ExResourceError = 20 ExResourceError = 20
ExInsufficientMemory = 23 ExInsufficientMemory = 23
ExInsufficientStorage = 26 ExInsufficientStorage = 26
@ -71,6 +74,7 @@ const (
ExInsufficientCores = 29 ExInsufficientCores = 29
// Error codes specific to the host // Error codes specific to the host
ExHostError = 30 ExHostError = 30
ExHostConflict = 31 ExHostConflict = 31
ExHostTimeout = 32 ExHostTimeout = 32
@ -81,6 +85,7 @@ const (
ExHostConfig = 38 ExHostConfig = 38
// Error codes specific to remote networking // Error codes specific to remote networking
ExInternetError = 40 ExInternetError = 40
ExInternetConflict = 41 ExInternetConflict = 41
ExInternetTimeout = 42 ExInternetTimeout = 42
@ -89,6 +94,7 @@ const (
ExInternetUnavailable = 49 ExInternetUnavailable = 49
// Error codes specific to the libmachine driver // Error codes specific to the libmachine driver
ExDriverError = 50 ExDriverError = 50
ExDriverConflict = 51 ExDriverConflict = 51
ExDriverTimeout = 52 ExDriverTimeout = 52
@ -100,11 +106,14 @@ const (
ExDriverUnavailable = 59 ExDriverUnavailable = 59
// Error codes specific to the driver provider // Error codes specific to the driver provider
ExProviderError = 60 ExProviderError = 60
ExProviderConflict = 61 ExProviderConflict = 61
ExProviderTimeout = 62 ExProviderTimeout = 62
ExProviderNotRunning = 63 ExProviderNotRunning = 63
// Reserve 64 for the moment as it used to be usage // Reserve 64 for the moment as it used to be usage
ExProviderNotFound = 65 ExProviderNotFound = 65
ExProviderUnsupported = 66 ExProviderUnsupported = 66
ExProviderPermission = 67 ExProviderPermission = 67
@ -112,6 +121,7 @@ const (
ExProviderUnavailable = 69 // In common use ExProviderUnavailable = 69 // In common use
// Error codes specific to local networking // Error codes specific to local networking
ExLocalNetworkError = 70 ExLocalNetworkError = 70
ExLocalNetworkConflict = 71 ExLocalNetworkConflict = 71
ExLocalNetworkTimeout = 72 ExLocalNetworkTimeout = 72
@ -121,6 +131,7 @@ const (
ExLocalNetworkUnavailable = 79 ExLocalNetworkUnavailable = 79
// Error codes specific to the guest host // Error codes specific to the guest host
ExGuestError = 80 ExGuestError = 80
ExGuestConflict = 81 ExGuestConflict = 81
ExGuestTimeout = 82 ExGuestTimeout = 82
@ -132,12 +143,14 @@ const (
ExGuestUnavailable = 89 ExGuestUnavailable = 89
// Error codes specific to the container runtime // Error codes specific to the container runtime
ExRuntimeError = 90 ExRuntimeError = 90
ExRuntimeNotRunning = 93 ExRuntimeNotRunning = 93
ExRuntimeNotFound = 95 ExRuntimeNotFound = 95
ExRuntimeUnavailable = 99 ExRuntimeUnavailable = 99
// Error codes specific to the Kubernetes control plane // Error codes specific to the Kubernetes control plane
ExControlPlaneError = 100 ExControlPlaneError = 100
ExControlPlaneConflict = 101 ExControlPlaneConflict = 101
ExControlPlaneTimeout = 102 ExControlPlaneTimeout = 102
@ -148,6 +161,7 @@ const (
ExControlPlaneUnavailable = 109 ExControlPlaneUnavailable = 109
// Error codes specific to a Kubernetes service // Error codes specific to a Kubernetes service
ExSvcError = 110 ExSvcError = 110
ExSvcConflict = 111 ExSvcConflict = 111
ExSvcTimeout = 112 ExSvcTimeout = 112

View File

@ -61,6 +61,7 @@ type Kind struct {
NoMatch bool NoMatch bool
} }
// IssueURLs returns URLs for issues
func (k *Kind) IssueURLs() []string { func (k *Kind) IssueURLs() []string {
is := []string{} is := []string{}
for _, i := range k.Issues { for _, i := range k.Issues {

View File

@ -45,6 +45,7 @@ func MakeTempDir() string {
return localpath.MiniPath() return localpath.MiniPath()
} }
// RemoveTempDir removes the temp dir
func RemoveTempDir(tempdir string) { func RemoveTempDir(tempdir string) {
if filepath.Base(tempdir) == ".minikube" { if filepath.Base(tempdir) == ".minikube" {
tempdir = filepath.Dir(tempdir) tempdir = filepath.Dir(tempdir)

View File

@ -17,9 +17,18 @@ limitations under the License.
package monitor package monitor
const ( const (
// GithubAccessTokenEnvVar is the env var name to use
GithubAccessTokenEnvVar = "GITHUB_ACCESS_TOKEN" GithubAccessTokenEnvVar = "GITHUB_ACCESS_TOKEN"
OkToTestLabel = "ok-to-test"
GithubOwner = "kubernetes" // OkToTestLabel is the github label for ok-to-test
GithubRepo = "minikube" OkToTestLabel = "ok-to-test"
BotName = "minikube-pr-bot"
// GithubOwner is the owner of the github repository
GithubOwner = "kubernetes"
// GithubRepo is the name of the github repository
GithubRepo = "minikube"
// BotName is the name of the minikube Pull Request bot
BotName = "minikube-pr-bot"
) )

View File

@ -47,14 +47,17 @@ func CalculateSizeInMB(humanReadableSize string) (int, error) {
return int(size / units.MiB), nil return int(size / units.MiB), nil
} }
// ConvertMBToBytes converts MB to bytes
func ConvertMBToBytes(mbSize int) int64 { func ConvertMBToBytes(mbSize int) int64 {
return int64(mbSize) * units.MiB return int64(mbSize) * units.MiB
} }
// ConvertBytesToMB converts bytes to MB
func ConvertBytesToMB(byteSize int64) int { func ConvertBytesToMB(byteSize int64) int {
return int(ConvertUnsignedBytesToMB(uint64(byteSize))) return int(ConvertUnsignedBytesToMB(uint64(byteSize)))
} }
// ConvertUnsignedBytesToMB converts bytes to MB
func ConvertUnsignedBytesToMB(byteSize uint64) int64 { func ConvertUnsignedBytesToMB(byteSize uint64) int64 {
return int64(byteSize / units.MiB) return int64(byteSize / units.MiB)
} }