Skip to content

Commit 2a6f719

Browse files
authored
fix: preallocate structs before append (#373)
Signed-off-by: Chris Gianelloni <[email protected]>
1 parent a5d92be commit 2a6f719

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

pkgmgr/docker.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Blink Labs Software
1+
// Copyright 2025 Blink Labs Software
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -161,7 +161,7 @@ func (d *DockerService) Create() error {
161161
return err
162162
}
163163
// Convert env
164-
var tmpEnv []string
164+
tmpEnv := []string{}
165165
for k, v := range d.Env {
166166
tmpEnv = append(
167167
tmpEnv,
@@ -359,7 +359,7 @@ func (d *DockerService) refresh() error {
359359
}
360360
d.Command = container.Config.Entrypoint[:]
361361
d.Args = container.Config.Cmd[:]
362-
var tmpBinds []string
362+
tmpBinds := []string{}
363363
for _, mount := range container.Mounts {
364364
if mount.Type != "bind" {
365365
continue
@@ -377,7 +377,7 @@ func (d *DockerService) refresh() error {
377377
tmpBinds = append(tmpBinds, tmpBind)
378378
}
379379
d.Binds = tmpBinds[:]
380-
var tmpPorts []string
380+
tmpPorts := []string{}
381381
for port, portBindings := range container.NetworkSettings.Ports {
382382
// Skip exposed container ports without a mapping
383383
if len(portBindings) == 0 {

pkgmgr/package.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,23 +715,23 @@ func (p *PackageInstallStepDocker) install(cfg Config, pkgName string) error {
715715
}
716716
tmpEnv[k] = tmplVal
717717
}
718-
var tmpCommand []string
718+
tmpCommand := []string{}
719719
for _, cmd := range p.Command {
720720
tmpCmd, err := cfg.Template.Render(cmd, extraVars)
721721
if err != nil {
722722
return err
723723
}
724724
tmpCommand = append(tmpCommand, tmpCmd)
725725
}
726-
var tmpArgs []string
726+
tmpArgs := []string{}
727727
for _, arg := range p.Args {
728728
tmpArg, err := cfg.Template.Render(arg, extraVars)
729729
if err != nil {
730730
return err
731731
}
732732
tmpArgs = append(tmpArgs, tmpArg)
733733
}
734-
var tmpBinds []string
734+
tmpBinds := []string{}
735735
for _, bind := range p.Binds {
736736
tmpBind, err := cfg.Template.Render(bind, extraVars)
737737
if err != nil {
@@ -753,7 +753,7 @@ func (p *PackageInstallStepDocker) install(cfg Config, pkgName string) error {
753753
)
754754
}
755755
}
756-
var tmpPorts []string
756+
tmpPorts := []string{}
757757
for _, port := range p.Ports {
758758
tmpPort, err := cfg.Template.Render(port, extraVars)
759759
if err != nil {

pkgmgr/pkgmgr.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Blink Labs Software
1+
// Copyright 2025 Blink Labs Software
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -172,7 +172,7 @@ func (p *PackageManager) Install(pkgs ...string) error {
172172
if err != nil {
173173
return err
174174
}
175-
var installedPkgs []string
175+
installedPkgs := []string{}
176176
var notesOutput string
177177
for _, installPkg := range installPkgs {
178178
p.config.Logger.Info(
@@ -256,7 +256,7 @@ func (p *PackageManager) Upgrade(pkgs ...string) error {
256256
if err != nil {
257257
return err
258258
}
259-
var installedPkgs []string
259+
installedPkgs := []string{}
260260
var notesOutput string
261261
for _, upgradePkg := range upgradePkgs {
262262
p.config.Logger.Info(
@@ -537,7 +537,7 @@ func (p *PackageManager) uninstallPackage(
537537
return err
538538
}
539539
// Remove package from installed packages
540-
var tmpInstalledPackages []InstalledPackage
540+
tmpInstalledPackages := []InstalledPackage{}
541541
for _, tmpInstalledPkg := range p.state.InstalledPackages {
542542
if tmpInstalledPkg.Context == uninstallPkg.Context &&
543543
tmpInstalledPkg.Package.Name == uninstallPkg.Package.Name &&

pkgmgr/resolver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func NewResolver(
8282
}
8383

8484
func (r *Resolver) Install(pkgs ...string) ([]ResolverInstallSet, error) {
85-
var ret []ResolverInstallSet
85+
ret := []ResolverInstallSet{}
8686
for _, pkg := range pkgs {
8787
pkgName, pkgVersionSpec, pkgOpts := r.splitPackage(pkg)
8888
if pkg, err := r.findInstalled(pkgName, ""); err != nil {
@@ -117,7 +117,7 @@ func (r *Resolver) Install(pkgs ...string) ([]ResolverInstallSet, error) {
117117
}
118118

119119
func (r *Resolver) Upgrade(pkgs ...string) ([]ResolverUpgradeSet, error) {
120-
var ret []ResolverUpgradeSet
120+
ret := []ResolverUpgradeSet{}
121121
for _, pkg := range pkgs {
122122
pkgName, pkgVersionSpec, pkgOpts := r.splitPackage(pkg)
123123
installedPkg, err := r.findInstalled(pkgName, "")
@@ -202,7 +202,7 @@ func (r *Resolver) Uninstall(pkgs ...InstalledPackage) error {
202202

203203
func (r *Resolver) getNeededDeps(pkg Package) ([]ResolverInstallSet, error) {
204204
// NOTE: this function is very naive and only works for a single level of dependencies
205-
var ret []ResolverInstallSet
205+
ret := []ResolverInstallSet{}
206206
for _, dep := range pkg.Dependencies {
207207
depPkgName, depPkgVersionSpec, depPkgOpts := r.splitPackage(dep)
208208
// Check if we already have an installed package that satisfies the dependency
@@ -338,7 +338,7 @@ func (r *Resolver) findAvailable(
338338
extraConstraints...,
339339
)
340340
}
341-
var ret []Package
341+
ret := []Package{}
342342
for _, availablePkg := range r.availablePkgs {
343343
if availablePkg.Name != pkgName {
344344
continue

0 commit comments

Comments
 (0)