fix: use maps package for copying (#411)

Signed-off-by: Chris Gianelloni <[email protected]>

Author: wolf31o2

pkgmgr/pkgmgr.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -183,9 +184,7 @@ func (p *PackageManager) Install(pkgs ...string) error {
 		)
 		// Build package options
 		tmpPkgOpts := installPkg.Install.defaultOpts()
-		for k, v := range installPkg.Options {
-			tmpPkgOpts[k] = v
-		}
+		maps.Copy(tmpPkgOpts, installPkg.Options)
 		// Install package
 		notes, outputs, err := installPkg.Install.install(
 			p.config,
@@ -660,9 +659,7 @@ func (p *PackageManager) updateContext(name string, newContext Context) error {
 func (p *PackageManager) ContextEnv() map[string]string {
 	ret := make(map[string]string)
 	for _, pkg := range p.InstalledPackages() {
-		for k, v := range pkg.Outputs {
-			ret[k] = v
-		}
+		maps.Copy(ret, pkg.Outputs)
 	}
 	return ret
 }

pkgmgr/template.go

@@ -17,6 +17,7 @@ package pkgmgr
 import (
 	"bytes"
 	"fmt"
+	"maps"
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
@@ -40,12 +41,8 @@ func (t *Template) Render(
 ) (string, error) {
 	// Build our vars
 	tmpVars := map[string]any{}
-	for k, v := range t.baseVars {
-		tmpVars[k] = v
-	}
-	for k, v := range extraVars {
-		tmpVars[k] = v
-	}
+	maps.Copy(tmpVars, t.baseVars)
+	maps.Copy(tmpVars, extraVars)
 	// Parse template body
 	tmpl, err := t.tmpl.Parse(tmplBody)
 	if err != nil {
@@ -62,12 +59,8 @@ func (t *Template) Render(
 // WithVars creates a copy of the Template with the extra variables added to the original base variables
 func (t *Template) WithVars(extraVars map[string]any) *Template {
 	tmpVars := map[string]any{}
-	for k, v := range t.baseVars {
-		tmpVars[k] = v
-	}
-	for k, v := range extraVars {
-		tmpVars[k] = v
-	}
+	maps.Copy(tmpVars, t.baseVars)
+	maps.Copy(tmpVars, extraVars)
 	tmpl := NewTemplate(tmpVars)
 	return tmpl
 }