Merge pull request #3 from mxpv/master

Configure machine dependencies via options

Author: mxpv

cmd/firectl/main.go

@@ -21,16 +21,11 @@ import (
 	"strconv"
 	"strings"
 
-	firecracker "github.com/firecracker-microvm/go-firecracker"
-	flags "github.com/jessevdk/go-flags"
+	"github.com/firecracker-microvm/go-firecracker"
+	"github.com/jessevdk/go-flags"
 	log "github.com/sirupsen/logrus"
 )
 
-func validateDriveEntry(entry string) error {
-
-	return nil
-}
-
 func checkConfig(cfg firecracker.Config) error {
 	var err error
 
@@ -216,8 +211,7 @@ func main() {
 		log.Fatalf("Configuration error: %s", err)
 	}
 
-	fireracker := firecracker.NewFirecrackerClient(fcCfg.SocketPath)
-	m := firecracker.NewMachine(fcCfg, fireracker, logger)
+	m := firecracker.NewMachine(fcCfg, firecracker.WithLogger(logger))
 
 	ctx := context.Background()
 	vmmCtx, vmmCancel := context.WithCancel(ctx)

machine.go

@@ -135,13 +135,21 @@ func (m Machine) LogLevel() string {
 }
 
 // NewMachine initializes a new Machine instance
-func NewMachine(cfg Config, firecracker Firecracker, l *log.Logger) *Machine {
+func NewMachine(cfg Config, opts ...Opt) *Machine {
 	m := &Machine{}
-	if l != nil {
-		m.logger = l
-	} else {
+
+	for _, opt := range opts {
+		opt(m)
+	}
+
+	if m.logger == nil {
 		m.logger = log.New()
 	}
+
+	if m.client == nil {
+		m.client = NewFirecrackerClient(cfg.SocketPath)
+	}
+
 	m.logger.Debug("Called NewMachine()")
 
 	m.cfg = cfg
@@ -151,14 +159,13 @@ func NewMachine(cfg Config, firecracker Firecracker, l *log.Logger) *Machine {
 		HtEnabled:   cfg.HtEnabled,
 		CPUTemplate: models.CPUTemplate(cfg.CPUTemplate),
 	}
+
 	if len(cfg.BinPath) > 0 {
 		m.binPath = cfg.BinPath
 	} else {
 		m.binPath = fcExecutable
 	}
 
-	m.client = firecracker
-
 	return m
 }
 

machine_test.go

@@ -39,7 +39,7 @@ func init() {
 
 // Ensure that we can create a new machine
 func TestNewMachine(t *testing.T) {
-	m := NewMachine(Config{}, NewFirecrackerClient(""), nil)
+	m := NewMachine(Config{})
 	if m == nil {
 		t.Errorf("NewMachine did not create a Machine")
 	}
@@ -63,7 +63,7 @@ func TestMicroVMExecution(t *testing.T) {
 		CPUTemplate: cpuTemplate,
 		MemInMiB:    memSz,
 	}
-	m := NewMachine(cfg, NewFirecrackerClient(cfg.SocketPath), nil)
+	m := NewMachine(cfg)
 	ctx := context.Background()
 	vmmCtx, vmmCancel := context.WithTimeout(ctx, 30*time.Second)
 	defer vmmCancel()
@@ -97,7 +97,7 @@ func TestStartVMM(t *testing.T) {
 		SocketPath: filepath.Join("fc-start-vmm-test.sock"),
 		BinPath:    getFirecrackerBinaryPath(),
 	}
-	m := NewMachine(cfg, NewFirecrackerClient(cfg.SocketPath), nil)
+	m := NewMachine(cfg)
 	timeout, cancel := context.WithTimeout(context.Background(), 250*time.Millisecond)
 	defer cancel()
 	errchan, err := m.startVMM(timeout)

opts.go

@@ -0,0 +1,19 @@
+package firecracker
+
+import (
+	"github.com/sirupsen/logrus"
+)
+
+type Opt func(*Machine)
+
+func WithClient(client Firecracker) Opt {
+	return func(machine *Machine) {
+		machine.client = client
+	}
+}
+
+func WithLogger(logger *logrus.Logger) Opt {
+	return func(machine *Machine) {
+		machine.logger = logger
+	}
+}