refactor: modules use session.Print/f/ln functions

Signed-off-by: Jens Drenhaus <jens.drenhaus@blindspot.software>

Author: Jens Drenhaus

pkg/module/agent/status.go

@@ -58,7 +58,7 @@ func (m *Status) Run(_ context.Context, s module.Session, _ ...string) error {
 		return fmt.Errorf("failed to run uname: %v", err)
 	}
 
-	s.Print(out.String())
+	s.Println(out.String())
 
 	return nil
 }

pkg/module/dummy/dummy_file_transfer.go

@@ -51,19 +51,16 @@ func (d *FT) Deinit() error {
 func (d *FT) Run(_ context.Context, s module.Session, args ...string) error {
 	log.Println("dummy.FT module: Run called")
 
-	s.Print("Hello from dummy file transfer module")
-
-	str := fmt.Sprintf("Called with %d arguments", len(args))
-	s.Print(str)
+	s.Println("Hello from dummy file transfer module")
+	s.Printf("Called with %d arguments\n", len(args))
 
 	const expectedArgsCnt = 2
 	if len(args) != expectedArgsCnt {
 		return fmt.Errorf("expected 2 arguments, got %d", len(args))
 	}
 
 	inFile := args[0]
-	str = fmt.Sprintf("Requesting file %q passed in arg[0] as input", inFile)
-	s.Print(str)
+	s.Printf("Requesting file %q passed in arg[0] as input\n", inFile)
 
 	fileReader, err := s.RequestFile(inFile)
 	if err != nil {
@@ -95,8 +92,7 @@ func (d *FT) Run(_ context.Context, s module.Session, args ...string) error {
 		return fmt.Errorf("failed to send file: %v", err)
 	}
 
-	str = fmt.Sprintf("File operated successfully, delivered %q as passed in arg[1] as output", outFile)
-	s.Print(str)
+	s.Printf("File operated successfully, delivered %q as passed in arg[1] as output\n", outFile)
 
 	return nil
 }

pkg/module/dummy/dummy_status.go

@@ -7,7 +7,6 @@ package dummy
 
 import (
 	"context"
-	"fmt"
 	"log"
 
 	"github.com/BlindspotSoftware/dutctl/pkg/module"
@@ -48,14 +47,11 @@ func (d *Status) Deinit() error {
 func (d *Status) Run(_ context.Context, s module.Session, args ...string) error {
 	log.Println("dummy.Status module: Run called")
 
-	s.Print("Hello from dummy status module")
-
-	str := fmt.Sprintf("Called with %d arguments", len(args))
-	s.Print(str)
+	s.Println("Hello from dummy status module")
+	s.Printf("Called with %d arguments\n", len(args))
 
 	for i, arg := range args {
-		str := fmt.Sprintf("Arg %d: %s", i, arg)
-		s.Print(str)
+		s.Printf("Arg %d: %s\n", i, arg)
 	}
 
 	return nil

pkg/module/gpio/gpio.go

@@ -169,7 +169,7 @@ func (b *Button) Run(_ context.Context, s module.Session, args ...string) error
 		return err
 	}
 
-	s.Print(fmt.Sprintf("Button pressed for %s", duration))
+	s.Printf("Button pressed for %s\n", duration)
 
 	return nil
 }

pkg/module/ipmi/ipmi.go

@@ -134,7 +134,7 @@ func (i *IPMI) Run(ctx context.Context, s module.Session, args ...string) error
 	}
 
 	if len(args) == 0 {
-		s.Print("No command specified. Try 'help' for usage.")
+		s.Println("No command specified. Try 'help' for usage.")
 
 		return nil
 	}
@@ -147,8 +147,8 @@ func (i *IPMI) Run(ctx context.Context, s module.Session, args ...string) error
 	case status:
 		return i.handleStatusCommand(ctx, s)
 	default:
-		s.Print("Unknown command: " + command)
-		s.Print("Available commands: on, off, cycle, reset, status")
+		s.Println("Unknown command: " + command)
+		s.Println("Available commands: on, off, cycle, reset, status")
 
 		return nil
 	}
@@ -180,7 +180,7 @@ func (i *IPMI) handlePowerCommand(ctx context.Context, s module.Session, command
 		return fmt.Errorf("power %s command failed: %v", command, err)
 	}
 
-	s.Print(message)
+	s.Println(message)
 
 	return nil
 }
@@ -196,7 +196,7 @@ func (i *IPMI) handleStatusCommand(ctx context.Context, s module.Session) error
 		powerStatus = "On"
 	}
 
-	s.Print(fmt.Sprintf("Device power status: %s", powerStatus))
+	s.Printf("Device power status: %s\n", powerStatus)
 
 	return nil
 }

pkg/module/pdu/pdu.go

@@ -113,7 +113,7 @@ func (p *PDU) Run(ctx context.Context, s module.Session, args ...string) error {
 	}
 
 	if len(args) == 0 {
-		s.Print("No command specified. Call 'help' for usage.")
+		s.Println("No command specified. Call 'help' for usage.")
 
 		return nil
 	}
@@ -126,8 +126,8 @@ func (p *PDU) Run(ctx context.Context, s module.Session, args ...string) error {
 	case status:
 		return p.status(ctx, s)
 	default:
-		s.Print("Unknown command: " + cmd)
-		s.Print("Available commands: on, off, toggle, status")
+		s.Println("Unknown command: " + cmd)
+		s.Println("Available commands: on, off, toggle, status")
 
 		return nil
 	}
@@ -176,7 +176,7 @@ func (p *PDU) setPower(ctx context.Context, s module.Session, state string) erro
 	}
 	defer resp.Body.Close()
 
-	s.Print(fmt.Sprintf("PDU outlet%d power set to '%s' successfully", p.Outlet, state))
+	s.Printf("PDU outlet%d power set to '%s' successfully\n", p.Outlet, state)
 
 	return nil
 }
@@ -198,7 +198,7 @@ func (p *PDU) status(ctx context.Context, s module.Session) error {
 		return err
 	}
 
-	s.Print(fmt.Sprintf("PDU outlet%d state: %s", p.Outlet, outletValue))
+	s.Printf("PDU outlet%d state: %s\n", p.Outlet, outletValue)
 
 	return nil
 }

pkg/module/time/wait.go

@@ -104,8 +104,7 @@ func (w *Wait) Run(_ context.Context, s module.Session, args ...string) error {
 		duration = w.duration
 	}
 
-	str := fmt.Sprintf("Waiting for %s", duration)
-	s.Print(str)
+	s.Printf("Waiting for %s\n", duration)
 
 	time.Sleep(duration)