cmd/image-builder: add mockable pkgSearcher and command tests

Extract the solver call into a pkgSearcher variable so tests can
replace it with a fake. Add table-driven integration tests covering
the full command flow with and without --type, error cases for
invalid distro/type/format.

Author: kingsleyzissou

cmd/image-builder/export_test.go

@@ -8,8 +8,10 @@ import (
 	"github.com/osbuild/image-builder/pkg/bootc"
 	"github.com/osbuild/image-builder/pkg/cloud"
 	"github.com/osbuild/image-builder/pkg/cloud/awscloud"
+	"github.com/osbuild/image-builder/pkg/distro"
 	"github.com/osbuild/image-builder/pkg/manifestgen"
 	"github.com/osbuild/image-builder/pkg/reporegistry"
+	"github.com/osbuild/image-builder/pkg/rpmmd"
 )
 
 var (
@@ -110,3 +112,11 @@ func MockManifestgenDepsolver(new manifestgen.DepsolveFunc) (restore func()) {
 		manifestgenDepsolver = saved
 	}
 }
+
+func MockPkgSearcher(f func(distro.Distro, string, string, []rpmmd.RepoConfig, []string) (rpmmd.PackageList, error)) (restore func()) {
+	saved := pkgSearcher
+	pkgSearcher = f
+	return func() {
+		pkgSearcher = saved
+	}
+}

cmd/image-builder/pkgsearch.go

@@ -56,6 +56,13 @@ func (*jsonPkgFormatter) Output(w io.Writer, pkgs rpmmd.PackageList) error {
 	return enc.Encode(result)
 }
 
+// pkgSearcher performs the actual package search. It is a variable so
+// tests can replace it with a fake that doesn't require osbuild-depsolve-dnf.
+var pkgSearcher = func(d distro.Distro, archStr, cacheDir string, repos []rpmmd.RepoConfig, packages []string) (rpmmd.PackageList, error) {
+	solver := depsolvednf.NewSolver(d.ModulePlatformID(), d.Releasever(), archStr, d.Name(), cacheDir)
+	return solver.SearchMetadata(repos, packages)
+}
+
 func cmdPkgSearch(cmd *cobra.Command, args []string) error {
 	format, err := cmd.Flags().GetString("format")
 	if err != nil {
@@ -144,8 +151,7 @@ func cmdPkgSearch(cmd *cobra.Command, args []string) error {
 	if cacheDir == "" {
 		cacheDir = defaultCacheDir()
 	}
-	solver := depsolvednf.NewSolver(d.ModulePlatformID(), d.Releasever(), archString, d.Name(), cacheDir)
-	results, err := solver.SearchMetadata(searchRepos, args)
+	results, err := pkgSearcher(d, archString, cacheDir, searchRepos, args)
 	if err != nil {
 		return err
 	}

cmd/image-builder/pkgsearch_test.go

@@ -8,7 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/osbuild/image-builder/pkg/distro"
 	"github.com/osbuild/image-builder/pkg/rpmmd"
+	testrepos "github.com/osbuild/image-builder/test/data/repositories"
 
 	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
@@ -46,6 +48,110 @@ func TestNewPkgSearchFormatter(t *testing.T) {
 	}
 }
 
+var lastCapturedCacheDir string
+
+func fakePkgSearcher(_ distro.Distro, _, cacheDir string, _ []rpmmd.RepoConfig, _ []string) (rpmmd.PackageList, error) {
+	lastCapturedCacheDir = cacheDir
+	return rpmmd.PackageList{
+		{Name: "bash", Version: "5.1.8", Release: "2.el9", Arch: "x86_64"},
+		{Name: "zsh", Version: "5.8", Release: "7.el9", Arch: "x86_64"},
+	}, nil
+}
+
+func TestCmdPkgSearch(t *testing.T) {
+	restorePkgSearcher := main.MockPkgSearcher(fakePkgSearcher)
+	defer restorePkgSearcher()
+
+	restoreRepoRegistry := main.MockNewRepoRegistry(testrepos.New)
+	defer restoreRepoRegistry()
+
+	for _, tc := range []struct {
+		name             string
+		args             []string
+		expectedPkgs     int
+		expectedErr      string
+		expectedCacheDir string
+	}{
+		{
+			name:         "with type",
+			args:         []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64", "--type=qcow2"},
+			expectedPkgs: 2,
+		},
+		{
+			name:         "without type",
+			args:         []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64"},
+			expectedPkgs: 2,
+		},
+		{
+			name:         "with json format",
+			args:         []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64", "--format=json"},
+			expectedPkgs: 2,
+		},
+		{
+			name:         "multiple packages",
+			args:         []string{"pkgsearch", "bash", "zsh", "--distro=centos-9", "--arch=x86_64"},
+			expectedPkgs: 2,
+		},
+		{
+			name:        "unsupported format",
+			args:        []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64", "--format=text"},
+			expectedErr: "unsupported",
+		},
+		{
+			name:        "invalid distro",
+			args:        []string{"pkgsearch", "bash", "--distro=not-a-distro", "--arch=x86_64"},
+			expectedErr: "not-a-distro",
+		},
+		{
+			name:        "invalid type",
+			args:        []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64", "--type=not-a-type"},
+			expectedErr: "not-a-type",
+		},
+		{
+			name:         "zero args (no packages)",
+			args:         []string{"pkgsearch", "--distro=centos-9", "--arch=x86_64"},
+			expectedPkgs: 2,
+		},
+		{
+			name:             "with rpmmd-cache",
+			args:             []string{"pkgsearch", "bash", "--distro=centos-9", "--arch=x86_64", "--rpmmd-cache=/tmp/test-cache"},
+			expectedPkgs:     2,
+			expectedCacheDir: "/tmp/test-cache",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			restore := main.MockOsArgs(tc.args)
+			defer restore()
+
+			var fakeStdout bytes.Buffer
+			restore = main.MockOsStdout(&fakeStdout)
+			defer restore()
+
+			err := main.Run()
+			if tc.expectedErr != "" {
+				require.Error(t, err)
+				assert.ErrorContains(t, err, tc.expectedErr)
+				return
+			}
+
+			require.NoError(t, err)
+
+			var result struct {
+				Packages []struct {
+					Name string `json:"name"`
+				} `json:"packages"`
+			}
+			err = json.Unmarshal(fakeStdout.Bytes(), &result)
+			require.NoError(t, err)
+			assert.Len(t, result.Packages, tc.expectedPkgs)
+
+			if tc.expectedCacheDir != "" {
+				assert.Equal(t, tc.expectedCacheDir, lastCapturedCacheDir)
+			}
+		})
+	}
+}
+
 func TestPkgSearchFormatterJSONOutput(t *testing.T) {
 	for _, tc := range []struct {
 		name         string