From 236a7a09fdce38423fcde97045ad71f79cfb4e1c Mon Sep 17 00:00:00 2001 From: Eran Cohen Date: Wed, 10 Apr 2024 09:41:54 +0300 Subject: [PATCH] NO-ISSUE: Decouple inventoryClient from ops (#811) Signed-off-by: Eran Cohen --- src/{ops => coreos_logger}/coreos_installer_log_writer.go | 2 +- .../coreos_installer_log_writer_test.go | 2 +- src/installer/installer.go | 3 ++- src/ops/mock_ops.go | 2 +- src/ops/ops.go | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename src/{ops => coreos_logger}/coreos_installer_log_writer.go (98%) rename src/{ops => coreos_logger}/coreos_installer_log_writer_test.go (99%) diff --git a/src/ops/coreos_installer_log_writer.go b/src/coreos_logger/coreos_installer_log_writer.go similarity index 98% rename from src/ops/coreos_installer_log_writer.go rename to src/coreos_logger/coreos_installer_log_writer.go index 0f08ee558..816095928 100644 --- a/src/ops/coreos_installer_log_writer.go +++ b/src/coreos_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 b/src/coreos_logger/coreos_installer_log_writer_test.go similarity index 99% rename from src/ops/coreos_installer_log_writer_test.go rename to src/coreos_logger/coreos_installer_log_writer_test.go index 73629cee9..1c007424c 100644 --- a/src/ops/coreos_installer_log_writer_test.go +++ b/src/coreos_logger/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 index ad820e6bf..48a569300 100644 --- 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 index 5c6077156..865dfa0dc 100644 --- a/src/ops/mock_ops.go +++ b/src/ops/mock_ops.go @@ -496,7 +496,7 @@ func (mr *MockOpsMockRecorder) Wipefs(device interface{}) *gomock.Call { } // WriteImageToDisk mocks base method. -func (m *MockOps) WriteImageToDisk(liveLogger *CoreosInstallerLogWriter, ignitionPath, device string, extraArgs []string) error { +func (m *MockOps) WriteImageToDisk(liveLogger io.Writer, ignitionPath, device string, extraArgs []string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "WriteImageToDisk", liveLogger, ignitionPath, device, extraArgs) ret0, _ := ret[0].(error) diff --git a/src/ops/ops.go b/src/ops/ops.go index 2ec6dff85..10f1f40bb 100644 --- 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)