Skip to content

Commit 2792a7e

Browse files
committed
Fix linter issues
Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com>
1 parent 0d45397 commit 2792a7e

File tree

20 files changed

+49
-49
lines changed

20 files changed

+49
-49
lines changed

cmd/kcp-front-proxy/options/options.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,5 @@ func (o *Options) Complete() error {
5858
}
5959

6060
func (o *Options) Validate() []error {
61-
var errs []error
62-
63-
errs = append(errs, o.Proxy.Validate()...)
64-
65-
return errs
61+
return o.Proxy.Validate()
6662
}

pkg/authentication/index.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (c *state) UpsertWorkspaceType(shard string, wst *tenancyv1alpha1.Workspace
7676

7777
clusterName := logicalcluster.From(wst)
7878

79-
authenticators := []authenticatorKey{}
79+
authenticators := make([]authenticatorKey, 0, len(wst.Spec.AuthenticationConfigurations))
8080
for _, authConfig := range wst.Spec.AuthenticationConfigurations {
8181
authenticators = append(authenticators, authenticatorKey{
8282
cluster: clusterName,

pkg/authorization/workspace_content_authorizer_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,14 @@ func TestWorkspaceContentAuthorizer(t *testing.T) {
329329
globalKubeClient := kcpfakeclient.NewSimpleClientset() // TODO(sttts): add some global fixtures
330330
local := kcpkubernetesinformers.NewSharedInformerFactory(localKubeClient, controller.NoResyncPeriodFunc())
331331
global := kcpkubernetesinformers.NewSharedInformerFactory(globalKubeClient, controller.NoResyncPeriodFunc())
332-
var syncs []cache.InformerSynced
333-
for _, inf := range []cache.SharedIndexInformer{
332+
informers := []cache.SharedIndexInformer{
334333
local.Rbac().V1().ClusterRoles().Informer(),
335334
local.Rbac().V1().ClusterRoleBindings().Informer(),
336335
global.Rbac().V1().ClusterRoles().Informer(),
337336
global.Rbac().V1().ClusterRoleBindings().Informer(),
338-
} {
337+
}
338+
syncs := make([]cache.InformerSynced, 0, len(informers))
339+
for _, inf := range informers {
339340
go inf.Run(ctx.Done())
340341
syncs = append(syncs, inf.HasSynced)
341342
}

pkg/features/kcp_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func featureSpecAtEmulationVersion(v featuregate.VersionedSpecs, emulationVersio
106106
}
107107

108108
func (f *kcpFeatureGate) String() string {
109-
pairs := []string{}
109+
pairs := make([]string, 0, len(defaultVersionedGenericControlPlaneFeatureGates))
110110
emulatedVersion := utilfeature.DefaultMutableFeatureGate.EmulationVersion()
111111

112112
for featureName, versionedSpecs := range defaultVersionedGenericControlPlaneFeatureGates {

pkg/informer/informer.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package informer
1919
import (
2020
"context"
2121
"fmt"
22+
"slices"
2223
"sort"
2324
"strings"
2425
"sync"
@@ -427,9 +428,7 @@ func (d *GenericDiscoveringDynamicSharedInformerFactory[Informer, Lister, Generi
427428

428429
handlers := d.handlers.Load().([]GVREventHandler)
429430

430-
newHandlers := make([]GVREventHandler, len(handlers))
431-
copy(newHandlers, handlers)
432-
431+
newHandlers := slices.Clone(handlers)
433432
newHandlers = append(newHandlers, handler)
434433

435434
d.handlers.Store(newHandlers)
@@ -616,7 +615,7 @@ func gvrsToDiscoveryData(gvrs map[schema.GroupVersionResource]GVRPartialMetadata
616615
}
617616

618617
for group, resources := range gvResources {
619-
var versions []metav1.GroupVersionForDiscovery
618+
versions := make([]metav1.GroupVersionForDiscovery, 0, len(resources))
620619
versionedResources := make(map[string][]metav1.APIResource)
621620

622621
for version, apiResource := range resources {

pkg/reconciler/apis/logicalclustercleanup/logicalclustercleanup_controller_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,11 @@ func (b *bindingBuilder) WithName(name string) *bindingBuilder {
164164
}
165165

166166
func (b *bindingBuilder) WithBoundResources(boundResources ...string) *bindingBuilder {
167+
if len(boundResources)%2 != 0 {
168+
panic("bound resources slice of unexpected length")
169+
}
167170
for i := 0; i < len(boundResources); i += 2 {
168-
group, resource := boundResources[i], boundResources[i+1]
171+
group, resource := boundResources[i], boundResources[i+1] //nolint:gosec // Bounds is checked with the modulo above
169172
b.Status.BoundResources = append(b.Status.BoundResources, apisv1alpha2.BoundAPIResource{
170173
Group: group,
171174
Resource: resource,

pkg/virtual/framework/dynamic/apiserver/openapi.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func addSpecs(service *handler3.OpenAPIService, routeSpecs map[string][]*spec3.O
355355
}
356356

357357
func apiConfigurationKey(apiDefs apidefinition.APIDefinitionSet) (string, error) {
358-
var buf bytes.Buffer
358+
buf := &bytes.Buffer{}
359359

360360
keys := make([]schema.GroupVersionResource, 0, len(apiDefs))
361361
for k := range apiDefs {
@@ -375,12 +375,12 @@ func apiConfigurationKey(apiDefs apidefinition.APIDefinitionSet) (string, error)
375375
}
376376

377377
if !firstAPIDef {
378-
buf.WriteRune(';')
378+
buf.WriteByte(';')
379379
}
380380

381381
buf.WriteString(apiDefSchema.Name)
382-
buf.WriteRune(':')
383-
buf.WriteString(fmt.Sprintf("%X", sha512.Sum512(bs)))
382+
buf.WriteByte(':')
383+
fmt.Fprintf(buf, "%X", sha512.Sum512(bs))
384384

385385
firstAPIDef = false
386386
}

pkg/virtual/framework/wrappers/rbac/merging.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (l *mergedRoleLister) List(selector labels.Selector) (ret []*rbacv1.Role, e
130130
}
131131

132132
func (l *mergedRoleLister) Roles(namespace string) rbaclisters.RoleNamespaceLister {
133-
aggregatedListers := make([]rbaclisters.RoleNamespaceLister, 0)
133+
aggregatedListers := make([]rbaclisters.RoleNamespaceLister, 0, len(l.listers))
134134
for _, inf := range l.listers {
135135
aggregatedListers = append(aggregatedListers, inf.Roles(namespace))
136136
}
@@ -207,7 +207,7 @@ func (l *mergedRoleBindingLister) Get(name string) (*rbacv1.RoleBinding, error)
207207
}
208208

209209
func (l *mergedRoleBindingLister) RoleBindings(namespace string) rbaclisters.RoleBindingNamespaceLister {
210-
aggregatedListers := make([]rbaclisters.RoleBindingNamespaceLister, 0)
210+
aggregatedListers := make([]rbaclisters.RoleBindingNamespaceLister, 0, len(l.listers))
211211
for _, inf := range l.listers {
212212
aggregatedListers = append(aggregatedListers, inf.RoleBindings(namespace))
213213
}

staging/src/github.com/kcp-dev/cli/pkg/bind/plugin/bind.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (b *BindOptions) newAPIBinding(preferredAPIBindingVersion string) (apishelp
243243
return nil, fmt.Errorf("%s is not supported by this plugin", preferredAPIBindingVersion)
244244
}
245245

246-
claims := []apisv1alpha2.AcceptablePermissionClaim{}
246+
claims := make([]apisv1alpha2.AcceptablePermissionClaim, 0, len(b.acceptedPermissionClaims)+len(b.rejectedPermissionClaims))
247247
claims = append(claims, b.acceptedPermissionClaims...)
248248
claims = append(claims, b.rejectedPermissionClaims...)
249249

staging/src/github.com/kcp-dev/code-generator/cmd/cluster-informer-gen/generators/generic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (v *version) Compare(other *version) int {
9090
func (g *genericGenerator) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
9191
sw := generator.NewSnippetWriter(w, c, "{{", "}}")
9292

93-
groups := []group{}
93+
groups := make([]group, 0, len(g.groupVersions))
9494
schemeGVs := make(map[*version]*types.Type)
9595

9696
orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)}

0 commit comments

Comments
 (0)