Address golang-ci lint failed checks

Signed-off-by: F. Gold <fgold@vmware.com>

hack/packages/package-tools/cmd/helpers.go

@@ -28,50 +28,15 @@ func readPackageValues(projectRootDir string) (PackageValues, error) {
 	return packageValues, nil
 }
 
-// filterPackageRepos returns a list of repos that should be generated.
-func filterPackageRepos(pkgVals PackageValues) ([]string, error) {
-	var filteredRepos []string
-
-	for repo := range pkgVals.Repositories {
-		if packageRepository == "" {
-			// --repository flag was not provided and is optional, so don't
-			// filter out any repos.
-			filteredRepos = append(filteredRepos, repo)
-			continue
-		}
-
-		_, found := pkgVals.Repositories[packageRepository]
-		if !found {
-			return nil, fmt.Errorf("%s repository not found", packageRepository)
-		}
-
-		if packageRepository == repo {
-			filteredRepos = append(filteredRepos, repo)
-		}
-	}
-
-	return filteredRepos, nil
-}
-
-// packagesContains checks if a package is in the given collection of packages.
-func packagesContains(packagesList []Package, pkg string) bool {
-	for _, p := range packagesList {
-		if p.Name == pkg {
-			return true
-		}
-	}
-	return false
-}
-
-// getPackageFromPackageValues returns the Package definition from package-values.yaml file
+// getPackageFromPackageValues returns the package definition from the package-values.yaml file.
 func getPackageFromPackageValues(projectRootDir, packageName string) (Package, error) {
 	packageValues, err := readPackageValues(projectRootDir)
 	if err != nil {
 		return Package{}, err
 	}
 
-	for _, repository := range packageValues.Repositories {
-		packages := repository.Packages
+	for i := range packageValues.Repositories {
+		packages := packageValues.Repositories[i].Packages
 		for _, pkg := range packages {
 			if pkg.Name == packageName {
 				return pkg, nil

hack/packages/package-tools/cmd/package-bundle-generate.go

@@ -72,12 +72,10 @@ func runPackageBundleGenerate(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		if err := generatePackageCR(projectRootDir,
-			toolsBinDir,
-			registry,
-			filepath.Join(projectRootDir, "build", "packages"),
-			filepath.Join(projectRootDir, constants.PackageValuesFilePath),
-			&pkg); err != nil {
+
+		buildPkgDir := filepath.Join(projectRootDir, "build", "packages")
+		pkgValsDir := filepath.Join(projectRootDir, constants.PackageValuesFilePath)
+		if err := generatePackageCR(projectRootDir, toolsBinDir, registry, buildPkgDir, pkgValsDir, &pkg); err != nil {
 			return err
 		}
 	}
@@ -160,28 +158,23 @@ func generatePackageBundle(projectRootDir, packageName, packagePath string) erro
 }
 
 func generatePackageBundles(projectRootDir, toolsBinDir string) error {
-	packageValuesData, err := os.ReadFile(filepath.Join(projectRootDir, constants.PackageValuesFilePath))
+	packageValues, err := readPackageValues(projectRootDir)
 	if err != nil {
 		return fmt.Errorf("couldn't read file %s: %w", packageValuesFile, err)
 	}
 
-	packageValues := PackageValues{}
-	if err := yaml.Unmarshal(packageValuesData, &packageValues); err != nil {
-		return fmt.Errorf("error while unmarshaling: %w", err)
-	}
-
 	repository, found := packageValues.Repositories[packageRepository]
 	if !found {
 		return fmt.Errorf("%s repository not found", packageRepository)
 	}
 
-	for i, pkg := range repository.Packages {
-		fmt.Printf("Generating %q package bundle...\n", pkg.Name)
+	for i := range repository.Packages {
+		fmt.Printf("Generating %q package bundle...\n", repository.Packages[i].Name)
 		imagePackageVersion := version
 		if subVersion != "" {
 			imagePackageVersion = version + "_" + subVersion
 		}
-		packagePath := filepath.Join(projectRootDir, "packages", packageRepository, pkg.Name)
+		packagePath := filepath.Join(projectRootDir, "packages", packageRepository, repository.Packages[i].Name)
 		if err := utils.RunMakeTarget(packagePath, "configure-package"); err != nil {
 			return err
 		}
@@ -192,9 +185,9 @@ func generatePackageBundles(projectRootDir, toolsBinDir string) error {
 		}
 
 		// push the imgpkg bundle to local registry
-		lockOutputFile := pkg.Name + "-" + imagePackageVersion + "-lock-output.yaml"
+		lockOutputFile := repository.Packages[i].Name + "-" + imagePackageVersion + "-lock-output.yaml"
 		imgpkgCmd := exec.Command(filepath.Join(toolsBinDir, "imgpkg"),
-			"push", "-b", constants.LocalRegistryURL+"/"+pkg.Name+":"+imagePackageVersion,
+			"push", "-b", constants.LocalRegistryURL+"/"+repository.Packages[i].Name+":"+imagePackageVersion,
 			"--file", filepath.Join(packagePath, "bundle"),
 			"--lock-output", lockOutputFile) // #nosec G204
 
@@ -216,7 +209,10 @@ func generatePackageBundles(projectRootDir, toolsBinDir string) error {
 		}
 
 		packageValues.Repositories[packageRepository].Packages[i].Version = getPackageVersion(version)
-		packageValues.Repositories[packageRepository].Packages[i].Sha256 = utils.AfterString(bundleLock.Bundle.Image, constants.LocalRegistryURL+"/"+pkg.Name+"@sha256:")
+		packageValues.Repositories[packageRepository].Packages[i].Sha256 = utils.AfterString(
+			bundleLock.Bundle.Image,
+			constants.LocalRegistryURL+"/"+repository.Packages[i].Name+"@sha256:",
+		)
 		yamlData, err := yaml.Marshal(&packageValues)
 		if err != nil {
 			return fmt.Errorf("error while marshaling: %w", err)
@@ -228,13 +224,13 @@ func generatePackageBundles(projectRootDir, toolsBinDir string) error {
 			return err
 		}
 
-		if err := generatePackageBundle(projectRootDir, pkg.Name, packagePath); err != nil {
+		if err := generatePackageBundle(projectRootDir, repository.Packages[i].Name, packagePath); err != nil {
 			return fmt.Errorf("couldn't generate package bundle: %w", err)
 		}
 
 		buildPkgsDir := filepath.Join(projectRootDir, "build", "packages")
 		pkgValsPath := filepath.Join(projectRootDir, constants.PackageValuesFilePath)
-		if err := generatePackageCR(projectRootDir, toolsBinDir, registry, buildPkgsDir, pkgValsPath, &pkg); err != nil {
+		if err := generatePackageCR(projectRootDir, toolsBinDir, registry, buildPkgsDir, pkgValsPath, &repository.Packages[i]); err != nil {
 			return err
 		}