Merge pull request #68113 from fengzixu/master

Fixes #68026: revise some errors about golint in some packages
kubernetes · Sep 25, 2018 · 5b864ac · 5b864ac
2 parents 893e87b + 1fbb8b2
commit 5b864ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -97,9 +97,6 @@ pkg/apis/storage/v1beta1
 pkg/apis/storage/v1beta1/util
 pkg/auth/authorizer/abac
 pkg/capabilities
-pkg/client/chaosclient
-pkg/client/leaderelectionconfig
-pkg/client/tests
 pkg/cloudprovider
 pkg/cloudprovider/providers/aws
 pkg/cloudprovider/providers/fake

diff --git a/pkg/client/chaosclient/chaosclient.go b/pkg/client/chaosclient/chaosclient.go
@@ -62,9 +62,11 @@ type ChaosNotifier interface {
 // error.
 type ChaosFunc func(req *http.Request) (bool, *http.Response, error)
 
+// Intercept calls the nested method `Intercept`
 func (fn ChaosFunc) Intercept(req *http.Request) (bool, *http.Response, error) {
 	return fn.Intercept(req)
 }
+
 func (fn ChaosFunc) String() string {
 	return runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name()
 }
@@ -141,7 +143,7 @@ type Error struct {
 	error
 }
 
-// C returns the nested error
+// Intercept returns the nested error
 func (e Error) Intercept(_ *http.Request) (bool, *http.Response, error) {
 	return true, nil, e.error
 }

diff --git a/pkg/client/leaderelectionconfig/config.go b/pkg/client/leaderelectionconfig/config.go
@@ -24,6 +24,7 @@ import (
 )
 
 const (
+	// DefaultLeaseDuration defines a default duration of lease.
 	DefaultLeaseDuration = 15 * time.Second
 )
 

diff --git a/pkg/client/tests/doc.go b/pkg/client/tests/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// This package runs tests against the client which require an internal client
+// Package tests runs tests against the client which require an internal client
 package tests
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testing/testcase.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testing/testcase.go
@@ -43,10 +43,10 @@ var matchEverythingRules = []registrationv1beta1.RuleWithOperations{{
 	},
 }}
 
-var sideEffectsUnknown registrationv1beta1.SideEffectClass = registrationv1beta1.SideEffectClassUnknown
-var sideEffectsNone registrationv1beta1.SideEffectClass = registrationv1beta1.SideEffectClassNone
-var sideEffectsSome registrationv1beta1.SideEffectClass = registrationv1beta1.SideEffectClassSome
-var sideEffectsNoneOnDryRun registrationv1beta1.SideEffectClass = registrationv1beta1.SideEffectClassNoneOnDryRun
+var sideEffectsUnknown = registrationv1beta1.SideEffectClassUnknown
+var sideEffectsNone = registrationv1beta1.SideEffectClassNone
+var sideEffectsSome = registrationv1beta1.SideEffectClassSome
+var sideEffectsNoneOnDryRun = registrationv1beta1.SideEffectClassNoneOnDryRun
 
 // NewFakeDataSource returns a mock client and informer returning the given webhooks.
 func NewFakeDataSource(name string, webhooks []registrationv1beta1.Webhook, mutating bool, stopCh <-chan struct{}) (clientset kubernetes.Interface, factory informers.SharedInformerFactory) {