Skip to content

Commit 9545bca

Browse files
committed
chore: fix linter errros
1 parent 74e1f17 commit 9545bca

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/kube/secrets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func (r *secretsReader) GetSecretsFromEnv(ctx context.Context, secretsInfo map[s
209209
return secretsFromEnv, nil
210210
}
211211

212-
func (r *secretsReader) CredentialsByServer(ctx context.Context, workload client.Object, secretsInfo map[string]string, multiSecretSupport bool, globalAccessEnabled bool) (map[string]docker.Auth, error) {
212+
func (r *secretsReader) CredentialsByServer(ctx context.Context, workload client.Object, secretsInfo map[string]string, multiSecretSupport, globalAccessEnabled bool) (map[string]docker.Auth, error) {
213213
var imagePullSecrets []corev1.Secret
214214

215215
if globalAccessEnabled {

pkg/kube/secrets_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010
corev1 "k8s.io/api/core/v1"
11+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1112
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1213

1314
"github.com/aquasecurity/trivy-operator/pkg/docker"
1415
"github.com/aquasecurity/trivy-operator/pkg/kube"
1516
"github.com/aquasecurity/trivy-operator/pkg/trivyoperator"
16-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717

1818
. "github.com/onsi/gomega"
1919
. "github.com/onsi/gomega/gstruct"
@@ -374,9 +374,9 @@ func Test_secretsReader_CredentialsByServer(t *testing.T) {
374374
},
375375
}
376376

377-
auths, err := sr.CredentialsByServer(t.Context(), &pod, map[string]string{}, false, false)
377+
auths, err := sr.CredentialsByServer(t.Context(), &pod, make(map[string]string), false, false)
378378
require.NoError(t, err)
379-
assert.Equal(t, 0, len(auths))
379+
assert.Empty(t, auths)
380380
})
381381

382382
t.Run("Test with secrets configured but globalAccess disabled should map container images to Docker authentication credentials from serviceaccount secret", func(t *testing.T) {
@@ -452,7 +452,7 @@ func Test_secretsReader_CredentialsByServer(t *testing.T) {
452452
"default": "regcred",
453453
}, true, true)
454454
require.NoError(t, err)
455-
assert.Equal(t, 1, len(auths))
455+
assert.Len(t, auths, 1)
456456
assert.Equal(t, map[string]docker.Auth{
457457
"quay.io": {Auth: "", Username: "admin,user", Password: "Password12345,Admin12345"},
458458
}, auths)

0 commit comments

Comments
 (0)