NO-ISSUE: Decouple inventoryClient from ops (#811)

Signed-off-by: Eran Cohen <eranco@redhat.com>
openshift · Apr 10, 2024 · 236a7a0 · 236a7a0
1 parent 4d2d54b
commit 236a7a0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/ops/coreos_installer_log_writer.go → ...eos_logger/coreos_installer_log_writer.go b/src/ops/coreos_installer_log_writer.go → ...eos_logger/coreos_installer_log_writer.go
@@ -1,4 +1,4 @@
-package ops
+package coreos_logger
 
 import (
 	"bytes"

diff --git a/src/ops/coreos_installer_log_writer_test.go → ...ogger/coreos_installer_log_writer_test.go b/src/ops/coreos_installer_log_writer_test.go → ...ogger/coreos_installer_log_writer_test.go
@@ -1,4 +1,4 @@
-package ops
+package coreos_logger
 
 import (
 	"io"

diff --git a/src/installer/installer.go b/src/installer/installer.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/openshift/assisted-installer/src/coreos_logger"
 	"github.com/openshift/assisted-installer/src/ops/execute"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 
@@ -315,7 +316,7 @@ func (i *installer) writeImageToDisk(ignitionPath string) error {
 	i.UpdateHostInstallProgress(models.HostStageWritingImageToDisk, "")
 
 	interval := time.Second
-	liveLogger := ops.NewCoreosInstallerLogWriter(i.log, i.inventoryClient, i.Config.InfraEnvID, i.Config.HostID)
+	liveLogger := coreos_logger.NewCoreosInstallerLogWriter(i.log, i.inventoryClient, i.Config.InfraEnvID, i.Config.HostID)
 	err := utils.Retry(3, interval, i.log, func() error {
 		return i.ops.WriteImageToDisk(liveLogger, ignitionPath, i.Device, i.Config.InstallerArgs)
 	})

diff --git a/src/ops/mock_ops.go b/src/ops/mock_ops.go
diff --git a/src/ops/ops.go b/src/ops/ops.go
@@ -48,7 +48,7 @@ const (
 //go:generate mockgen -source=ops.go -package=ops -destination=mock_ops.go
 type Ops interface {
 	Mkdir(dirName string) error
-	WriteImageToDisk(liveLogger *CoreosInstallerLogWriter, ignitionPath string, device string, extraArgs []string) error
+	WriteImageToDisk(liveLogger io.Writer, ignitionPath string, device string, extraArgs []string) error
 	Reboot(delay string) error
 	SetBootOrder(device string) error
 	ExtractFromIgnition(ignitionPath string, fileToExtract string) error
@@ -133,7 +133,7 @@ func (o *ops) SystemctlAction(action string, args ...string) error {
 	return errors.Wrapf(err, "Failed executing systemctl %s %s", action, args)
 }
 
-func (o *ops) WriteImageToDisk(liveLogger *CoreosInstallerLogWriter, ignitionPath string, device string, extraArgs []string) error {
+func (o *ops) WriteImageToDisk(liveLogger io.Writer, ignitionPath string, device string, extraArgs []string) error {
 	allArgs := installerArgs(ignitionPath, device, extraArgs)
 	o.log.Infof("Writing image and ignition to disk with arguments: %v", allArgs)