Fix golangci-lint issues

Author: p-se

internal/cmd/controller/options/calculate_test.go

@@ -16,7 +16,7 @@ func TestMergeChain(t *testing.T) {
 		Helm: &fleet.HelmOptions{
 			ReleaseName: "base-release",
 			Values: &fleet.GenericMap{
-				Data: map[string]interface{}{
+				Data: map[string]any{
 					"source": "base",
 					"edge":   "false",
 					"extra":  "false",
@@ -28,7 +28,7 @@ func TestMergeChain(t *testing.T) {
 	edgeCustomization := fleet.BundleDeploymentOptions{
 		Helm: &fleet.HelmOptions{
 			Values: &fleet.GenericMap{
-				Data: map[string]interface{}{
+				Data: map[string]any{
 					"source": "edge",
 					"edge":   "true",
 				},
@@ -39,7 +39,7 @@ func TestMergeChain(t *testing.T) {
 	extraCustomization := fleet.BundleDeploymentOptions{
 		Helm: &fleet.HelmOptions{
 			Values: &fleet.GenericMap{
-				Data: map[string]interface{}{
+				Data: map[string]any{
 					"source": "extra",
 					"extra":  "true",
 				},

internal/cmd/controller/target/matcher/bundlematch_test.go

@@ -83,7 +83,9 @@ func TestHasMatchingRestriction(t *testing.T) {
 // targetCustomizations come first in Targets, followed by the GitRepo target.
 // The GitRepo target is also added as a TargetRestriction.
 func makeBundle(gitRepoTarget fleet.BundleTarget, customizations []fleet.BundleTarget) *fleet.Bundle {
-	targets := append(customizations, gitRepoTarget)
+	targets := make([]fleet.BundleTarget, 0, len(customizations)+1)
+	targets = append(targets, customizations...)
+	targets = append(targets, gitRepoTarget)
 	b := &fleet.Bundle{
 		Spec: fleet.BundleSpec{
 			Targets: targets,