cmd/image-builder: mock simple integration tests (HMS-10857)

cmd/image-builder/export_test.go

@@ -25,25 +25,25 @@ var (
 
 type DescribeImgYAML describeImgYAML
 
-func MockOsArgs(new []string) (restore func()) {
+func MockOsArgs(args []string) (restore func()) {
 	saved := os.Args
-	os.Args = append([]string{"argv0"}, new...)
+	os.Args = append([]string{"argv0"}, args...)
 	return func() {
 		os.Args = saved
 	}
 }
 
-func MockOsStdout(new io.Writer) (restore func()) {
+func MockOsStdout(w io.Writer) (restore func()) {
 	saved := osStdout
-	osStdout = new
+	osStdout = w
 	return func() {
 		osStdout = saved
 	}
 }
 
-func MockOsStderr(new io.Writer) (restore func()) {
+func MockOsStderr(w io.Writer) (restore func()) {
 	saved := osStderr
-	osStderr = new
+	osStderr = w
 	return func() {
 		osStderr = saved
 	}
@@ -102,10 +102,18 @@ func MockDirSize(f func(string) (int64, error)) (restore func()) {
 	}
 }
 
-func MockManifestgenDepsolver(new manifestgen.DepsolveFunc) (restore func()) {
+func MockManifestgenDepsolver(fn manifestgen.DepsolveFunc) (restore func()) {
 	saved := manifestgenDepsolver
-	manifestgenDepsolver = new
+	manifestgenDepsolver = fn
 	return func() {
 		manifestgenDepsolver = saved
 	}
 }
+
+func MockManifestgenContainerResolver(fn manifestgen.ContainerResolverFunc) (restore func()) {
+	saved := manifestgenContainerResolver
+	manifestgenContainerResolver = fn
+	return func() {
+		manifestgenContainerResolver = saved
+	}
+}

cmd/image-builder/main.go

@@ -243,6 +243,7 @@ type cmdManifestWrapperOptions struct {
 
 // used in tests
 var manifestgenDepsolver manifestgen.DepsolveFunc
+var manifestgenContainerResolver manifestgen.ContainerResolverFunc
 
 func getImage(cmd *cobra.Command, args []string) (*imagefilter.Result, error) {
 	repoDir, err := cmd.Flags().GetString("force-repo-dir")
@@ -494,6 +495,7 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 			RpmDownloader:          rpmDownloader,
 			DepsolveWarningsOutput: wd,
 			Depsolve:               manifestgenDepsolver,
+			ContainerResolver:      manifestgenContainerResolver,
 		},
 		OutputDir:                  outputDir,
 		OutputFilename:             outputFilename,