Skip to content

Commit 8cfbd0c

Browse files
committed
fix lint checks
1 parent 43a8c8e commit 8cfbd0c

3 files changed

Lines changed: 23 additions & 54 deletions

File tree

pkg/apis/config/install/install.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package install
88

99
import (
1010
"k8s.io/apimachinery/pkg/runtime"
11+
"k8s.io/apimachinery/pkg/runtime/schema"
1112
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1213

1314
"github.com/gardener/gardener-extension-shoot-traefik/pkg/apis/config"
@@ -17,6 +18,6 @@ import (
1718
// Install registers the API group and adds types to a scheme
1819
func Install(scheme *runtime.Scheme) {
1920
utilruntime.Must(config.AddToScheme(scheme))
20-
utilruntime.Must(v1alpha1.AddToScheme(scheme))
21-
utilruntime.Must(scheme.SetVersionPriority(v1alpha1.SchemeGroupVersion))
21+
utilruntime.Must(v1alpha1.Install(scheme))
22+
utilruntime.Must(scheme.SetVersionPriority(schema.GroupVersion(v1alpha1.GroupVersion)))
2223
}

pkg/traefik/deployer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type Deployer struct {
6161
}
6262

6363
// NewDeployer creates a new Deployer.
64-
func NewDeployer(c client.Client, logger logr.Logger, config Config, imageVector imagevector.ImageVector) *Deployer {
64+
func NewDeployer(c client.Client, logger logr.Logger, cfg Config, imageVector imagevector.ImageVector) *Deployer {
6565
scheme := runtime.NewScheme()
6666
_ = corev1.AddToScheme(scheme)
6767
_ = appsv1.AddToScheme(scheme)
@@ -72,7 +72,7 @@ func NewDeployer(c client.Client, logger logr.Logger, config Config, imageVector
7272
client: c,
7373
decoder: serializer.NewCodecFactory(scheme).UniversalDecoder(),
7474
logger: logger.WithName("traefik-deployer"),
75-
config: config,
75+
config: cfg,
7676
imageVector: imageVector,
7777
}
7878
}

pkg/traefik/deployer_test.go

Lines changed: 18 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package traefik
66

77
import (
8+
"slices"
89
"strings"
910
"testing"
1011

@@ -213,14 +214,7 @@ func TestDeployment_IngressProvider(t *testing.T) {
213214

214215
// Check expected args are present
215216
for _, expectedArg := range tt.expectedArgs {
216-
found := false
217-
for _, arg := range args {
218-
if arg == expectedArg {
219-
found = true
220-
break
221-
}
222-
}
223-
if !found {
217+
if !slices.Contains(args, expectedArg) {
224218
t.Errorf("expected arg %q not found in deployment args: %v", expectedArg, args)
225219
}
226220
}
@@ -243,14 +237,7 @@ func TestDeployment_IngressProvider(t *testing.T) {
243237
"--entrypoints.websecure.address=:8443",
244238
}
245239
for _, commonArg := range commonArgs {
246-
found := false
247-
for _, arg := range args {
248-
if arg == commonArg {
249-
found = true
250-
break
251-
}
252-
}
253-
if !found {
240+
if !slices.Contains(args, commonArg) {
254241
t.Errorf("common arg %q not found in deployment args: %v", commonArg, args)
255242
}
256243
}
@@ -303,27 +290,16 @@ func TestClusterRole_RBAC_Permissions(t *testing.T) {
303290
// Check for namespace permissions
304291
hasNamespacePerms := false
305292
for _, rule := range clusterRole.Rules {
306-
for _, resource := range rule.Resources {
307-
if resource == "namespaces" {
308-
hasNamespacePerms = true
309-
// Verify the permissions are correct
310-
expectedVerbs := []string{"get", "list", "watch"}
311-
for _, verb := range expectedVerbs {
312-
found := false
313-
for _, v := range rule.Verbs {
314-
if v == verb {
315-
found = true
316-
break
317-
}
318-
}
319-
if !found {
320-
t.Errorf("expected verb %q for namespaces resource not found", verb)
321-
}
293+
if slices.Contains(rule.Resources, "namespaces") {
294+
hasNamespacePerms = true
295+
// Verify the permissions are correct
296+
expectedVerbs := []string{"get", "list", "watch"}
297+
for _, verb := range expectedVerbs {
298+
if !slices.Contains(rule.Verbs, verb) {
299+
t.Errorf("expected verb %q for namespaces resource not found", verb)
322300
}
323-
break
324301
}
325-
}
326-
if hasNamespacePerms {
302+
327303
break
328304
}
329305
}
@@ -347,23 +323,15 @@ func TestClusterRole_RBAC_Permissions(t *testing.T) {
347323
for resource, expectedVerbs := range commonResources {
348324
found := false
349325
for _, rule := range clusterRole.Rules {
350-
for _, res := range rule.Resources {
351-
if res == resource {
352-
found = true
353-
for _, verb := range expectedVerbs {
354-
verbFound := false
355-
for _, v := range rule.Verbs {
356-
if v == verb {
357-
verbFound = true
358-
break
359-
}
360-
}
361-
if !verbFound {
362-
t.Errorf("expected verb %q for resource %q not found", verb, resource)
363-
}
326+
if slices.Contains(rule.Resources, resource) {
327+
found = true
328+
for _, verb := range expectedVerbs {
329+
if !slices.Contains(rule.Verbs, verb) {
330+
t.Errorf("expected verb %q for resource %q not found", verb, resource)
364331
}
365-
break
366332
}
333+
334+
break
367335
}
368336
}
369337
if !found {

0 commit comments

Comments
 (0)