Skip to content

Commit 5e48ba2

Browse files
cyclingwithelephantscyclingwithelephants
committed
appease the linter
1 parent d883dfa commit 5e48ba2

3 files changed

Lines changed: 27 additions & 20 deletions

File tree

‎internal/controller/clustertunnel_controller.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controller
1818

1919
import (
2020
"context"
21+
2122
"github.com/adyanth/cloudflare-operator/internal/k8s"
2223

2324
appsv1 "k8s.io/api/apps/v1"
@@ -149,7 +150,8 @@ func (r *ClusterTunnelReconciler) Reconcile(ctx context.Context, req ctrl.Reques
149150
if err != nil {
150151
return ctrl.Result{}, err
151152
}
152-
if err := secretClient.RemoveFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer); err != nil {
153+
err = secretClient.RemoveFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer)
154+
if err != nil {
153155
return ctrl.Result{}, err
154156
}
155157
return ctrl.Result{}, nil
@@ -166,7 +168,8 @@ func (r *ClusterTunnelReconciler) Reconcile(ctx context.Context, req ctrl.Reques
166168
if err != nil {
167169
return ctrl.Result{}, err
168170
}
169-
if err := secretClient.EnsureFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer); err != nil {
171+
err = secretClient.EnsureFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer)
172+
if err != nil {
170173
return ctrl.Result{}, err
171174
}
172175

‎internal/controller/tunnel_controller.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controller
1818

1919
import (
2020
"context"
21+
2122
"github.com/adyanth/cloudflare-operator/internal/k8s"
2223

2324
corev1 "k8s.io/api/core/v1"
@@ -144,7 +145,8 @@ func (r *TunnelReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
144145
if err != nil {
145146
return ctrl.Result{}, err
146147
}
147-
if err := secretClient.RemoveFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer); err != nil {
148+
err = secretClient.RemoveFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer)
149+
if err != nil {
148150
return ctrl.Result{}, err
149151
}
150152
return ctrl.Result{}, nil
@@ -161,7 +163,8 @@ func (r *TunnelReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
161163
if err != nil {
162164
return ctrl.Result{}, err
163165
}
164-
if err := secretClient.EnsureFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer); err != nil {
166+
err = secretClient.EnsureFinalizer(ctx, r.GetTunnel().GetSpec().Cloudflare.Secret, r.GetTunnel().GetNamespace(), tunnelFinalizer)
167+
if err != nil {
165168
return ctrl.Result{}, err
166169
}
167170

‎internal/k8s/secret.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@ package k8s
22

33
import (
44
"context"
5-
"fmt"
5+
"errors"
6+
67
"github.com/go-logr/logr"
78
corev1 "k8s.io/api/core/v1"
8-
"k8s.io/apimachinery/pkg/api/errors"
9+
k8serrors "k8s.io/apimachinery/pkg/api/errors"
910
"sigs.k8s.io/controller-runtime/pkg/client"
1011
)
1112

1213
type SecretClient struct {
13-
client client.Client
14-
log *logr.Logger
14+
k8sClient client.Client
15+
log *logr.Logger
1516
}
1617

17-
func NewSecretClient(client client.Client, log *logr.Logger) (*SecretClient, error) {
18-
if client == nil {
19-
return nil, fmt.Errorf("client cannot be nil")
18+
func NewSecretClient(k8sClient client.Client, log *logr.Logger) (*SecretClient, error) {
19+
if k8sClient == nil {
20+
return nil, errors.New("k8sClient cannot be nil")
2021
}
2122
if log == nil {
22-
return nil, fmt.Errorf("logger cannot be nil")
23+
return nil, errors.New("logger cannot be nil")
2324
}
2425
return &SecretClient{
25-
client: client,
26-
log: log,
26+
k8sClient: k8sClient,
27+
log: log,
2728
}, nil
2829
}
2930

@@ -34,20 +35,20 @@ func (s *SecretClient) EnsureFinalizer(ctx context.Context, secretName, secretNa
3435
Name: secretName,
3536
Namespace: secretNamespace,
3637
}
37-
if err := s.client.Get(ctx, secretKey, &secret); err != nil {
38+
if err := s.k8sClient.Get(ctx, secretKey, &secret); err != nil {
3839
return err
3940
}
4041

4142
// if finalizer already exists, we are happy
42-
for _, existingFinalizer := range secret.ObjectMeta.Finalizers {
43+
for _, existingFinalizer := range secret.Finalizers {
4344
if finalizer == existingFinalizer {
4445
return nil
4546
}
4647
}
4748

4849
s.log.WithValues("finalizer", finalizer).Info("creating finalizer")
4950
secret.Finalizers = append(secret.Finalizers, finalizer)
50-
return s.client.Update(ctx, &secret)
51+
return s.k8sClient.Update(ctx, &secret)
5152
}
5253

5354
// RemoveFinalizer removes the first instance of the finalizer from the given secret
@@ -57,16 +58,16 @@ func (s *SecretClient) RemoveFinalizer(ctx context.Context, secretName, secretNa
5758
Name: secretName,
5859
Namespace: secretNamespace,
5960
}
60-
if err := s.client.Get(ctx, secretKey, &secret); err != nil {
61-
if errors.IsNotFound(err) {
61+
if err := s.k8sClient.Get(ctx, secretKey, &secret); err != nil {
62+
if k8serrors.IsNotFound(err) {
6263
return nil
6364
}
6465
return err
6566
}
6667

6768
s.log.WithValues("finalizer", finalizer).Info("deleting finalizer")
6869
secret.Finalizers = removeString(secret.Finalizers, finalizer)
69-
return s.client.Update(ctx, &secret)
70+
return s.k8sClient.Update(ctx, &secret)
7071
}
7172

7273
// removeString returns a copy of list with the first (only) occurrence

0 commit comments

Comments
 (0)