Skip to content

Commit 5461422

Browse files
author
Per Goncalves da Silva
committed
Fix lint issues
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 3866934 commit 5461422

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

pkg/client/actionclient_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ type mockPostRenderer struct {
902902
var _ postrender.PostRenderer = &mockPostRenderer{}
903903

904904
func newMockPostRenderer(key, value string) PostRendererProvider {
905-
return func(rm meta.RESTMapper, kubeClient kube.Interface, obj client.Object) postrender.PostRenderer {
905+
return func(_ meta.RESTMapper, kubeClient kube.Interface, _ client.Object) postrender.PostRenderer {
906906
return &mockPostRenderer{
907907
k8sCli: kubeClient,
908908
key: key,

pkg/client/actionconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (acg *actionConfigGetter) ActionConfigFor(ctx context.Context, obj client.O
195195
func getDebugLogger(ctx context.Context) func(format string, v ...interface{}) {
196196
logger, err := logr.FromContext(ctx)
197197
if err != nil {
198-
return func(format string, v ...interface{}) {}
198+
return func(_ string, _ ...interface{}) {}
199199
}
200200
return func(format string, v ...interface{}) {
201201
logger.V(1).Info(fmt.Sprintf(format, v...))

pkg/client/actionconfig_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ metadata:
166166
})
167167

168168
It("should use a custom rest config mapping", func() {
169-
restConfigMapper := func(ctx context.Context, obj client.Object, cfg *rest.Config) (*rest.Config, error) {
169+
restConfigMapper := func(_ context.Context, obj client.Object, _ *rest.Config) (*rest.Config, error) {
170170
return &rest.Config{
171171
BearerToken: obj.GetName(),
172172
}, nil
@@ -192,7 +192,7 @@ metadata:
192192
It("should use a custom storage driver", func() {
193193
storageDriver := driver.NewMemory()
194194

195-
storageDriverMapper := func(ctx context.Context, obj client.Object, cfg *rest.Config) (driver.Driver, error) {
195+
storageDriverMapper := func(_ context.Context, _ client.Object, _ *rest.Config) (driver.Driver, error) {
196196
return storageDriver, nil
197197
}
198198
acg, err := NewActionConfigGetter(cfg, rm, StorageDriverMapper(storageDriverMapper))
@@ -209,7 +209,7 @@ metadata:
209209

210210
expected := &release.Release{Name: "test1", Version: 2, Info: &release.Info{Status: release.StatusDeployed}}
211211
Expect(ac.Releases.Create(expected)).To(Succeed())
212-
actual, err := storageDriver.List(func(r *release.Release) bool { return true })
212+
actual, err := storageDriver.List(func(_ *release.Release) bool { return true })
213213
Expect(err).ToNot(HaveOccurred())
214214
Expect(actual).To(HaveLen(1))
215215
Expect(actual[0]).To(Equal(expected))

pkg/reconciler/internal/hook/hook_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,20 @@ var _ = Describe("Hook", func() {
9292
Expect(err).To(HaveOccurred())
9393
})
9494
It("should fail with unknown owner kind", func() {
95-
Expect(drw.Exec(owner, *rel, log)).To(MatchError(&meta.NoKindMatchError{
95+
var err error = &meta.NoKindMatchError{
9696
GroupKind: schema.GroupKind{Group: "apps", Kind: "Deployment"},
9797
SearchedVersions: []string{"v1"},
98-
}))
98+
}
99+
100+
Expect(drw.Exec(owner, *rel, log)).To(MatchError(err))
99101
})
100102
It("should fail with unknown dependent kind", func() {
101103
rm.Add(schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}, meta.RESTScopeNamespace)
102-
Expect(drw.Exec(owner, *rel, log)).To(MatchError(&meta.NoKindMatchError{
104+
var err error = &meta.NoKindMatchError{
103105
GroupKind: schema.GroupKind{Group: "apps", Kind: "ReplicaSet"},
104106
SearchedVersions: []string{"v1"},
105-
}))
107+
}
108+
Expect(drw.Exec(owner, *rel, log)).To(MatchError(err))
106109
})
107110
})
108111

pkg/reconciler/internal/values/values.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var DefaultMaxReleaseHistory = 10
3232

3333
var DefaultMapper = values.MapperFunc(func(v chartutil.Values) chartutil.Values { return v })
3434

35-
var DefaultTranslator = values.TranslatorFunc(func(ctx context.Context, u *unstructured.Unstructured) (chartutil.Values, error) {
35+
var DefaultTranslator = values.TranslatorFunc(func(_ context.Context, u *unstructured.Unstructured) (chartutil.Values, error) {
3636
return getSpecMap(u)
3737
})
3838

pkg/reconciler/reconciler_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ var _ = Describe("Reconciler", func() {
120120
Expect(err).ToNot(HaveOccurred())
121121
})
122122
It("should return an error if an option func fails", func() {
123-
r, err := New(func(r *Reconciler) error { return errors.New("expect this error") })
123+
r, err := New(func(_ *Reconciler) error { return errors.New("expect this error") })
124124
Expect(r).To(BeNil())
125125
Expect(err).To(MatchError("expect this error"))
126126
})
@@ -415,7 +415,7 @@ var _ = Describe("Reconciler", func() {
415415
})
416416
_ = Describe("WithValueTranslator", func() {
417417
It("should set the reconciler value translator", func() {
418-
translator := values.TranslatorFunc(func(ctx context.Context, u *unstructured.Unstructured) (chartutil.Values, error) {
418+
translator := values.TranslatorFunc(func(_ context.Context, _ *unstructured.Unstructured) (chartutil.Values, error) {
419419
return chartutil.Values{"translated": true}, nil
420420
})
421421
Expect(WithValueTranslator(translator)(r)).To(Succeed())
@@ -934,7 +934,7 @@ var _ = Describe("Reconciler", func() {
934934
})
935935
When("value translator fails", func() {
936936
BeforeEach(func() {
937-
r.valueTranslator = values.TranslatorFunc(func(ctx context.Context, u *unstructured.Unstructured) (chartutil.Values, error) {
937+
r.valueTranslator = values.TranslatorFunc(func(_ context.Context, _ *unstructured.Unstructured) (chartutil.Values, error) {
938938
return nil, errors.New("translation failure")
939939
})
940940
})

pkg/storage/chunked_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var _ = Describe("chunkedSecrets", func() {
221221
MaxReadChunks: 1,
222222
MaxWriteChunks: 2,
223223
})
224-
actual, err := maxReadDriver.List(func(rel *release.Release) bool { return true })
224+
actual, err := maxReadDriver.List(func(_ *release.Release) bool { return true })
225225
Expect(err).To(MatchError(ContainSubstring("release too large")))
226226
Expect(actual).To(BeNil())
227227
})

0 commit comments

Comments
 (0)