Merge pull request kubernetes#85001 from bmoix/fix-golint-kubelet-httpgetter

k8s-ci-robot · web-flow · commit e624d1b7bfaa · 2019-12-06T17:05:53.000-08:00
kubelet: rename HTTPGetter interface
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -159,7 +159,7 @@ func NewKubeGenericRuntimeManager(
 	podStateProvider podStateProvider,
 	osInterface kubecontainer.OSInterface,
 	runtimeHelper kubecontainer.RuntimeHelper,
-	httpClient types.HttpGetter,
+	httpClient types.HTTPGetter,
 	imageBackOff *flowcontrol.Backoff,
 	serializeImagePulls bool,
 	imagePullQPS float32,
diff --git a/pkg/kubelet/lifecycle/handlers.go b/pkg/kubelet/lifecycle/handlers.go
@@ -38,7 +38,7 @@ const (
 )
 
 type HandlerRunner struct {
-	httpGetter       kubetypes.HttpGetter
+	httpGetter       kubetypes.HTTPGetter
 	commandRunner    kubecontainer.ContainerCommandRunner
 	containerManager podStatusProvider
 }
@@ -47,7 +47,7 @@ type podStatusProvider interface {
 	GetPodStatus(uid types.UID, name, namespace string) (*kubecontainer.PodStatus, error)
 }
 
-func NewHandlerRunner(httpGetter kubetypes.HttpGetter, commandRunner kubecontainer.ContainerCommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {
+func NewHandlerRunner(httpGetter kubetypes.HTTPGetter, commandRunner kubecontainer.ContainerCommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {
 	return &HandlerRunner{
 		httpGetter:       httpGetter,
 		commandRunner:    commandRunner,
diff --git a/pkg/kubelet/types/types.go b/pkg/kubelet/types/types.go
@@ -26,7 +26,9 @@ import (
 
 // TODO: Reconcile custom types in kubelet/types and this subpackage
 
-type HttpGetter interface {
+// HTTPGetter is an interface representing the ability to perform HTTP GET requests.
+type HTTPGetter interface {
+	// Get issues a GET to the specified URL.
 	Get(url string) (*http.Response, error)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ const (`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`type HandlerRunner struct {`
`41`		`- httpGetter kubetypes.HttpGetter`
	`41`	`+ httpGetter kubetypes.HTTPGetter`
`42`	`42`	`commandRunner kubecontainer.ContainerCommandRunner`
`43`	`43`	`containerManager podStatusProvider`
`44`	`44`	`}`
`@@ -47,7 +47,7 @@ type podStatusProvider interface {`
`47`	`47`	`GetPodStatus(uid types.UID, name, namespace string) (*kubecontainer.PodStatus, error)`
`48`	`48`	`}`
`49`	`49`
`50`		`-func NewHandlerRunner(httpGetter kubetypes.HttpGetter, commandRunner kubecontainer.ContainerCommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {`
	`50`	`+func NewHandlerRunner(httpGetter kubetypes.HTTPGetter, commandRunner kubecontainer.ContainerCommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {`
`51`	`51`	`return &HandlerRunner{`
`52`	`52`	`httpGetter: httpGetter,`
`53`	`53`	`commandRunner: commandRunner,`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ import (`
`26`	`26`
`27`	`27`	`// TODO: Reconcile custom types in kubelet/types and this subpackage`
`28`	`28`
`29`		`-type HttpGetter interface {`
	`29`	`+// HTTPGetter is an interface representing the ability to perform HTTP GET requests.`
	`30`	`+type HTTPGetter interface {`
	`31`	`+ // Get issues a GET to the specified URL.`
`30`	`32`	`Get(url string) (*http.Response, error)`
`31`	`33`	`}`
`32`	`34`