Skip to content

Commit 6dbda2f

Browse files
mcristina422mcristina422
committed
Fix linter errors
1 parent 7f899c3 commit 6dbda2f

File tree

12 files changed

+37
-42
lines changed

12 files changed

+37
-42
lines changed

‎pkg/client/client_cache.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,8 @@ type resourceMeta struct {
124124

125125
// isNamespaced returns true if the type is namespaced
126126
func (r *resourceMeta) isNamespaced() bool {
127-
if r.mapping.Scope.Name() == meta.RESTScopeNameRoot {
128-
return false
129-
}
130-
return true
127+
return r.mapping.Scope.Name() != meta.RESTScopeNameRoot
128+
131129
}
132130

133131
// resource returns the resource name of the type

‎pkg/client/fake/client_test.go

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122

2223
. "github.com/onsi/ginkgo"
@@ -85,7 +86,7 @@ var _ = Describe("Fake client", func() {
8586
Namespace: "ns1",
8687
}
8788
obj := &appsv1.Deployment{}
88-
err := cl.Get(nil, namespacedName, obj)
89+
err := cl.Get(context.Background(), namespacedName, obj)
8990
Expect(err).To(BeNil())
9091
Expect(obj).To(Equal(dep))
9192
})
@@ -99,14 +100,14 @@ var _ = Describe("Fake client", func() {
99100
obj := &unstructured.Unstructured{}
100101
obj.SetAPIVersion("apps/v1")
101102
obj.SetKind("Deployment")
102-
err := cl.Get(nil, namespacedName, obj)
103+
err := cl.Get(context.Background(), namespacedName, obj)
103104
Expect(err).To(BeNil())
104105
})
105106

106107
It("should be able to List", func() {
107108
By("Listing all deployments in a namespace")
108109
list := &appsv1.DeploymentList{}
109-
err := cl.List(nil, list, client.InNamespace("ns1"))
110+
err := cl.List(context.Background(), list, client.InNamespace("ns1"))
110111
Expect(err).To(BeNil())
111112
Expect(list.Items).To(HaveLen(2))
112113
Expect(list.Items).To(ConsistOf(*dep, *dep2))
@@ -117,15 +118,15 @@ var _ = Describe("Fake client", func() {
117118
list := &unstructured.UnstructuredList{}
118119
list.SetAPIVersion("apps/v1")
119120
list.SetKind("DeploymentList")
120-
err := cl.List(nil, list, client.InNamespace("ns1"))
121+
err := cl.List(context.Background(), list, client.InNamespace("ns1"))
121122
Expect(err).To(BeNil())
122123
Expect(list.Items).To(HaveLen(2))
123124
})
124125

125126
It("should support filtering by labels", func() {
126127
By("Listing deployments with a particular label")
127128
list := &appsv1.DeploymentList{}
128-
err := cl.List(nil, list, client.InNamespace("ns1"),
129+
err := cl.List(context.Background(), list, client.InNamespace("ns1"),
129130
client.MatchingLabels(map[string]string{
130131
"test-label": "label-value",
131132
}))
@@ -146,7 +147,7 @@ var _ = Describe("Fake client", func() {
146147
Namespace: "ns2",
147148
},
148149
}
149-
err := cl.Create(nil, newcm)
150+
err := cl.Create(context.Background(), newcm)
150151
Expect(err).To(BeNil())
151152

152153
By("Getting the new configmap")
@@ -155,7 +156,7 @@ var _ = Describe("Fake client", func() {
155156
Namespace: "ns2",
156157
}
157158
obj := &corev1.ConfigMap{}
158-
err = cl.Get(nil, namespacedName, obj)
159+
err = cl.Get(context.Background(), namespacedName, obj)
159160
Expect(err).To(BeNil())
160161
Expect(obj).To(Equal(newcm))
161162
Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1"))
@@ -177,7 +178,7 @@ var _ = Describe("Fake client", func() {
177178
"test-key": "new-value",
178179
},
179180
}
180-
err := cl.Update(nil, newcm)
181+
err := cl.Update(context.Background(), newcm)
181182
Expect(err).To(BeNil())
182183

183184
By("Getting the new configmap")
@@ -186,33 +187,33 @@ var _ = Describe("Fake client", func() {
186187
Namespace: "ns2",
187188
}
188189
obj := &corev1.ConfigMap{}
189-
err = cl.Get(nil, namespacedName, obj)
190+
err = cl.Get(context.Background(), namespacedName, obj)
190191
Expect(err).To(BeNil())
191192
Expect(obj).To(Equal(newcm))
192193
Expect(obj.ObjectMeta.ResourceVersion).To(Equal("2"))
193194
})
194195

195196
It("should be able to Delete", func() {
196197
By("Deleting a deployment")
197-
err := cl.Delete(nil, dep)
198+
err := cl.Delete(context.Background(), dep)
198199
Expect(err).To(BeNil())
199200

200201
By("Listing all deployments in the namespace")
201202
list := &appsv1.DeploymentList{}
202-
err = cl.List(nil, list, client.InNamespace("ns1"))
203+
err = cl.List(context.Background(), list, client.InNamespace("ns1"))
203204
Expect(err).To(BeNil())
204205
Expect(list.Items).To(HaveLen(1))
205206
Expect(list.Items).To(ConsistOf(*dep2))
206207
})
207208

208209
It("should be able to Delete a Collection", func() {
209210
By("Deleting a deploymentList")
210-
err := cl.DeleteAllOf(nil, &appsv1.Deployment{}, client.InNamespace("ns1"))
211+
err := cl.DeleteAllOf(context.Background(), &appsv1.Deployment{}, client.InNamespace("ns1"))
211212
Expect(err).To(BeNil())
212213

213214
By("Listing all deployments in the namespace")
214215
list := &appsv1.DeploymentList{}
215-
err = cl.List(nil, list, client.InNamespace("ns1"))
216+
err = cl.List(context.Background(), list, client.InNamespace("ns1"))
216217
Expect(err).To(BeNil())
217218
Expect(list.Items).To(BeEmpty())
218219
})
@@ -226,7 +227,7 @@ var _ = Describe("Fake client", func() {
226227
Namespace: "ns2",
227228
},
228229
}
229-
err := cl.Create(nil, newcm, client.CreateDryRunAll)
230+
err := cl.Create(context.Background(), newcm, client.DryRunAll)
230231
Expect(err).To(BeNil())
231232

232233
By("Getting the new configmap")
@@ -235,7 +236,7 @@ var _ = Describe("Fake client", func() {
235236
Namespace: "ns2",
236237
}
237238
obj := &corev1.ConfigMap{}
238-
err = cl.Get(nil, namespacedName, obj)
239+
err = cl.Get(context.Background(), namespacedName, obj)
239240
Expect(err).To(HaveOccurred())
240241
Expect(errors.IsNotFound(err)).To(BeTrue())
241242
Expect(obj).NotTo(Equal(newcm))
@@ -253,7 +254,7 @@ var _ = Describe("Fake client", func() {
253254
"test-key": "new-value",
254255
},
255256
}
256-
err := cl.Update(nil, newcm, client.UpdateDryRunAll)
257+
err := cl.Update(context.Background(), newcm, client.DryRunAll)
257258
Expect(err).To(BeNil())
258259

259260
By("Getting the new configmap")
@@ -262,7 +263,7 @@ var _ = Describe("Fake client", func() {
262263
Namespace: "ns2",
263264
}
264265
obj := &corev1.ConfigMap{}
265-
err = cl.Get(nil, namespacedName, obj)
266+
err = cl.Get(context.Background(), namespacedName, obj)
266267
Expect(err).To(BeNil())
267268
Expect(obj).To(Equal(cm))
268269
Expect(obj.ObjectMeta.ResourceVersion).To(Equal(""))
@@ -279,7 +280,7 @@ var _ = Describe("Fake client", func() {
279280
},
280281
})
281282
Expect(err).NotTo(HaveOccurred())
282-
err = cl.Patch(nil, dep, client.RawPatch(types.StrategicMergePatchType, mergePatch))
283+
err = cl.Patch(context.Background(), dep, client.RawPatch(types.StrategicMergePatchType, mergePatch))
283284
Expect(err).NotTo(HaveOccurred())
284285

285286
By("Getting the patched deployment")
@@ -288,7 +289,7 @@ var _ = Describe("Fake client", func() {
288289
Namespace: "ns1",
289290
}
290291
obj := &appsv1.Deployment{}
291-
err = cl.Get(nil, namespacedName, obj)
292+
err = cl.Get(context.Background(), namespacedName, obj)
292293
Expect(err).NotTo(HaveOccurred())
293294
Expect(obj.Annotations["foo"]).To(Equal("bar"))
294295
Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1"))

‎pkg/controller/controller_integration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ var _ = Describe("controller", func() {
122122
By("Invoking Reconciling for Update")
123123
newDeployment := deployment.DeepCopy()
124124
newDeployment.Labels = map[string]string{"foo": "bar"}
125-
newDeployment, err = clientset.AppsV1().Deployments("default").Update(newDeployment)
125+
_, err = clientset.AppsV1().Deployments("default").Update(newDeployment)
126126
Expect(err).NotTo(HaveOccurred())
127127
Expect(<-reconciled).To(Equal(expectedReconcileRequest))
128128

@@ -152,7 +152,7 @@ var _ = Describe("controller", func() {
152152
By("Invoking Reconciling for an OwnedObject when it is updated")
153153
newReplicaset := replicaset.DeepCopy()
154154
newReplicaset.Labels = map[string]string{"foo": "bar"}
155-
newReplicaset, err = clientset.AppsV1().ReplicaSets("default").Update(newReplicaset)
155+
_, err = clientset.AppsV1().ReplicaSets("default").Update(newReplicaset)
156156
Expect(err).NotTo(HaveOccurred())
157157
Expect(<-reconciled).To(Equal(expectedReconcileRequest))
158158

‎pkg/handler/eventhandler_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ var _ = Describe("Eventhandler", func() {
4242
t := true
4343
BeforeEach(func() {
4444
q = controllertest.Queue{Interface: workqueue.New()}
45-
instance = handler.EnqueueRequestForObject{}
4645
pod = &corev1.Pod{
4746
ObjectMeta: metav1.ObjectMeta{Namespace: "biz", Name: "baz"},
4847
}

‎pkg/internal/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func (c *Controller) reconcileHandler(obj interface{}) bool {
236236
// Update metrics after processing each item
237237
reconcileStartTS := time.Now()
238238
defer func() {
239-
c.updateMetrics(time.Now().Sub(reconcileStartTS))
239+
c.updateMetrics(time.Since(reconcileStartTS))
240240
}()
241241

242242
var req reconcile.Request

‎pkg/internal/testing/integration/etcd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (e *Etcd) setProcessState() error {
8686
return err
8787
}
8888

89-
e.processState.StartMessage = internal.GetEtcdStartMessage(e.processState.URL)
89+
e.processState.HealthCheckEndpoint = "/health"
9090

9191
e.URL = &e.processState.URL
9292
e.DataDir = e.processState.Dir

‎pkg/leaderelection/fake/leader_election.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (f *ResourceLock) Update(ler resourcelock.LeaderElectionRecord) error {
7676

7777
// RecordEvent implements the ResourceLockInterface.
7878
func (f *ResourceLock) RecordEvent(s string) {
79-
return
79+
8080
}
8181

8282
// Identity implements the ResourceLockInterface.

‎pkg/log/zap/zap_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ type fakeLoggerRoot struct {
5858
messages []logInfo
5959
}
6060

61+
var _ logr.Logger = &fakeLogger{}
62+
6163
// fakeLogger is a fake implementation of logr.Logger that records
6264
// messages, tags, and names,
6365
// just records the name.

‎pkg/manager/internal.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,9 @@ func (cm *controllerManager) serveMetrics(stop <-chan struct{}) {
360360
}()
361361

362362
// Shutdown the server when stop is closed
363-
select {
364-
case <-stop:
365-
if err := server.Shutdown(context.Background()); err != nil {
366-
cm.errSignal.SignalError(err)
367-
}
363+
<-stop
364+
if err := server.Shutdown(context.Background()); err != nil {
365+
cm.errSignal.SignalError(err)
368366
}
369367
}
370368

@@ -392,11 +390,9 @@ func (cm *controllerManager) serveHealthProbes(stop <-chan struct{}) {
392390
cm.mu.Unlock()
393391

394392
// Shutdown the server when stop is closed
395-
select {
396-
case <-stop:
397-
if err := server.Shutdown(context.Background()); err != nil {
398-
cm.errSignal.SignalError(err)
399-
}
393+
<-stop
394+
if err := server.Shutdown(context.Background()); err != nil {
395+
cm.errSignal.SignalError(err)
400396
}
401397
}
402398

‎pkg/manager/signals/signal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var _ = Describe("runtime signal", func() {
3636
task := &Task{
3737
ticker: time.NewTicker(time.Second * 2),
3838
}
39-
c := make(chan os.Signal)
39+
c := make(chan os.Signal, 1)
4040
signal.Notify(c, os.Interrupt)
4141
task.wg.Add(1)
4242
go func(c chan os.Signal) {

‎pkg/reconcile/example_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626

2727
// This example implements a simple no-op reconcile function that prints the object to be Reconciled.
2828
func ExampleFunc() {
29-
type Reconciler struct{}
3029

3130
r := reconcile.Func(func(o reconcile.Request) (reconcile.Result, error) {
3231
// Create your business logic to create, update, delete objects here.

‎pkg/webhook/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (s *Server) Register(path string, hook http.Handler) {
119119
func instrumentedHook(path string, hookRaw http.Handler) http.Handler {
120120
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
121121
startTS := time.Now()
122-
defer func() { metrics.RequestLatency.WithLabelValues(path).Observe(time.Now().Sub(startTS).Seconds()) }()
122+
defer func() { metrics.RequestLatency.WithLabelValues(path).Observe(time.Since(startTS).Seconds()) }()
123123
hookRaw.ServeHTTP(resp, req)
124124

125125
// TODO(directxman12): add back in metric about total requests broken down by result?

0 commit comments

Comments
 (0)