Skip to content

Commit eb8cef5

Browse files
committed
Fix linter errors
1 parent 959004e commit eb8cef5

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

internal/controller/dextoken_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ func (r *DeXTokenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
6464
logger := log.FromContext(ctx)
6565

6666
dexToken := &dexchangev1alpha1.DeXToken{}
67-
if err := r.Client.Get(ctx, req.NamespacedName, dexToken); err != nil {
67+
if err := r.Get(ctx, req.NamespacedName, dexToken); err != nil {
6868
return ctrl.Result{}, err
6969
}
7070

71-
if !dexToken.ObjectMeta.DeletionTimestamp.IsZero() {
71+
if !dexToken.DeletionTimestamp.IsZero() {
7272
return ctrl.Result{}, nil
7373
}
7474

@@ -95,7 +95,7 @@ func (r *DeXTokenReconciler) reconcileNormal(ctx context.Context, dexToken *dexc
9595
secretKey := dexToken.Spec.SecretKey
9696

9797
var secret corev1.Secret
98-
if err := r.Client.Get(ctx, client.ObjectKey{
98+
if err := r.Get(ctx, client.ObjectKey{
9999
Namespace: dexToken.Namespace,
100100
Name: dexToken.Status.TokenSecretName,
101101
}, &secret); err != nil && !apierrors.IsNotFound(err) {
@@ -134,6 +134,7 @@ func (r *DeXTokenReconciler) reconcileNormal(ctx context.Context, dexToken *dexc
134134
}, nil
135135
}
136136

137+
//nolint:unparam
137138
func (r *DeXTokenReconciler) checkExpired(ctx context.Context, dexToken *dexchangev1alpha1.DeXToken, secret *corev1.Secret, secretKey string) (ctrl.Result, error) {
138139
logger := log.FromContext(ctx)
139140

@@ -207,7 +208,7 @@ func (r *DeXTokenReconciler) issueServiceAccountToken(ctx context.Context, dexTo
207208
serviceAccountName := dexToken.Spec.ServiceAccount.Name
208209

209210
var serviceAccount corev1.ServiceAccount
210-
err := r.Client.Get(ctx, client.ObjectKey{
211+
err := r.Get(ctx, client.ObjectKey{
211212
Namespace: dexToken.Namespace,
212213
Name: serviceAccountName,
213214
}, &serviceAccount)
@@ -233,7 +234,7 @@ func (r *DeXTokenReconciler) issueServiceAccountToken(ctx context.Context, dexTo
233234
func (r *DeXTokenReconciler) getClientSecret(ctx context.Context, dexToken *dexchangev1alpha1.DeXToken) (string, error) {
234235
if dexToken.Spec.DeX.ClientSecretRef.Name != "" {
235236
var secret corev1.Secret
236-
if err := r.Client.Get(ctx, client.ObjectKey{
237+
if err := r.Get(ctx, client.ObjectKey{
237238
Namespace: dexToken.Namespace,
238239
Name: dexToken.Spec.DeX.ClientSecretRef.Name,
239240
}, &secret); err != nil {

internal/dex/dex.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ func Issue(ctx context.Context, config Config) (string, error) {
4545
if err != nil {
4646
return "", fmt.Errorf("failed to send a request: %w", err)
4747
}
48-
defer resp.Body.Close()
48+
defer func() {
49+
_ = resp.Body.Close()
50+
}()
4951

5052
if resp.StatusCode != http.StatusOK {
5153
b, _ := io.ReadAll(resp.Body)

test/e2e/e2e_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +93,27 @@ var _ = Describe("Manager", Ordered, func() {
9393
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
9494
controllerLogs, err := utils.Run(cmd)
9595
if err == nil {
96-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Controller logs:\n %s", controllerLogs))
96+
_, _ = fmt.Fprintf(GinkgoWriter, "Controller logs:\n %s", controllerLogs)
9797
} else {
98-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Failed to get Controller logs: %s", err))
98+
_, _ = fmt.Fprintf(GinkgoWriter, "Failed to get Controller logs: %s", err)
9999
}
100100

101101
By("Fetching Kubernetes events")
102102
cmd = exec.Command("kubectl", "get", "events", "-n", namespace, "--sort-by=.lastTimestamp")
103103
eventsOutput, err := utils.Run(cmd)
104104
if err == nil {
105-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Kubernetes events:\n%s", eventsOutput))
105+
_, _ = fmt.Fprintf(GinkgoWriter, "Kubernetes events:\n%s", eventsOutput)
106106
} else {
107-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Failed to get Kubernetes events: %s", err))
107+
_, _ = fmt.Fprintf(GinkgoWriter, "Failed to get Kubernetes events: %s", err)
108108
}
109109

110110
By("Fetching curl-metrics logs")
111111
cmd = exec.Command("kubectl", "logs", "curl-metrics", "-n", namespace)
112112
metricsOutput, err := utils.Run(cmd)
113113
if err == nil {
114-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Metrics logs:\n %s", metricsOutput))
114+
_, _ = fmt.Fprintf(GinkgoWriter, "Metrics logs:\n %s", metricsOutput)
115115
} else {
116-
_, _ = fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Failed to get curl-metrics logs: %s", err))
116+
_, _ = fmt.Fprintf(GinkgoWriter, "Failed to get curl-metrics logs: %s", err)
117117
}
118118

119119
By("Fetching controller manager pod description")
@@ -278,7 +278,7 @@ func serviceAccountToken() (string, error) {
278278

279279
// Parse the JSON output to extract the token
280280
var token tokenRequest
281-
err = json.Unmarshal([]byte(output), &token)
281+
err = json.Unmarshal(output, &token)
282282
g.Expect(err).NotTo(HaveOccurred())
283283

284284
out = token.Status.Token

test/utils/utils.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"os/exec"
2525
"strings"
2626

27-
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
27+
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
2828
)
2929

3030
const (
@@ -92,7 +92,7 @@ func IsPrometheusCRDsInstalled() bool {
9292
if err != nil {
9393
return false
9494
}
95-
crdList := GetNonEmptyLines(string(output))
95+
crdList := GetNonEmptyLines(output)
9696
for _, crd := range prometheusCRDs {
9797
for _, line := range crdList {
9898
if strings.Contains(line, crd) {
@@ -153,7 +153,7 @@ func IsCertManagerCRDsInstalled() bool {
153153
}
154154

155155
// Check if any of the Cert Manager CRDs are present
156-
crdList := GetNonEmptyLines(string(output))
156+
crdList := GetNonEmptyLines(output)
157157
for _, crd := range certManagerCRDs {
158158
for _, line := range crdList {
159159
if strings.Contains(line, crd) {
@@ -197,7 +197,7 @@ func GetProjectDir() (string, error) {
197197
if err != nil {
198198
return wd, err
199199
}
200-
wd = strings.Replace(wd, "/test/e2e", "", -1)
200+
wd = strings.ReplaceAll(wd, "/test/e2e", "")
201201
return wd, nil
202202
}
203203

0 commit comments

Comments
 (0)