Fixed some lint errors after rebasing.

googleforgames · Apr 14, 2018 · 2c69845 · 2c69845
1 parent d39d939
commit 2c69845
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pkg/apis/stable/v1alpha1/fleet.go b/pkg/apis/stable/v1alpha1/fleet.go
@@ -20,6 +20,8 @@ import (
 )
 
 const (
+	// FleetGameServerSetLabel is the label that the name of the Fleet
+	// is set to on the GameServerSet the Fleet controls
 	FleetGameServerSetLabel = stable.GroupName + "/fleet"
 )
 
@@ -62,7 +64,7 @@ type FleetStatus struct {
 	ReadyReplicas int32 `json:"readyReplicas"`
 }
 
-// Fleet returns a single GameServerSet for this Fleet definition
+// GameServerSet returns a single GameServerSet for this Fleet definition
 func (f *Fleet) GameServerSet() *GameServerSet {
 	gsSet := &GameServerSet{
 		ObjectMeta: *f.Spec.Template.ObjectMeta.DeepCopy(),

diff --git a/pkg/gameserversets/helper_test.go b/pkg/gameserversets/helper_test.go
@@ -28,15 +28,15 @@ import (
 )
 
 // holder for all my fakes and mocks
-type mocks struct {
+type mocks struct { // nolint: megacheck
 	kubeClient            *kubefake.Clientset
 	extClient             *extfake.Clientset
 	agonesClient          *agonesfake.Clientset
 	agonesInformerFactory externalversions.SharedInformerFactory
 	fakeRecorder          *record.FakeRecorder
 }
 
-func newMocks() mocks {
+func newMocks() mocks { // nolint: megacheck
 	kubeClient := &kubefake.Clientset{}
 	extClient := &extfake.Clientset{}
 	agonesClient := &agonesfake.Clientset{}
@@ -51,7 +51,7 @@ func newMocks() mocks {
 	return m
 }
 
-func startInformers(mocks mocks, sync ...cache.InformerSynced) (<-chan struct{}, context.CancelFunc) {
+func startInformers(mocks mocks, sync ...cache.InformerSynced) (<-chan struct{}, context.CancelFunc) { // nolint: megacheck
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	stop := ctx.Done()
 

diff --git a/pkg/testing/controller.go b/pkg/testing/controller.go
@@ -31,7 +31,7 @@ import (
 
 // Handy tools for testing controllers
 
-// holder for all my fakes and Mocks
+// Mocks is a holder for all my fakes and Mocks
 type Mocks struct {
 	KubeClient             *kubefake.Clientset
 	KubeInformationFactory informers.SharedInformerFactory
@@ -41,6 +41,7 @@ type Mocks struct {
 	FakeRecorder           *record.FakeRecorder
 }
 
+// NewMocks creates a new set of fakes and mocks.
 func NewMocks() Mocks {
 	kubeClient := &kubefake.Clientset{}
 	agonesClient := &agonesfake.Clientset{}
@@ -56,6 +57,7 @@ func NewMocks() Mocks {
 	return m
 }
 
+// StartInformers starts new fake informers
 func StartInformers(mocks Mocks, sync ...cache.InformerSynced) (<-chan struct{}, context.CancelFunc) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	stop := ctx.Done()
@@ -71,6 +73,7 @@ func StartInformers(mocks Mocks, sync ...cache.InformerSynced) (<-chan struct{},
 	return stop, cancel
 }
 
+// NewEstablishedCRD fakes CRD installation success.
 func NewEstablishedCRD() *v1beta1.CustomResourceDefinition {
 	return &v1beta1.CustomResourceDefinition{
 		Status: v1beta1.CustomResourceDefinitionStatus{