Make Infrakit build on Windows (even if not functional) (#687)

Signed-off-by: Simon Ferquel <[email protected]>

Author: simonferquel

Makefile

@@ -29,11 +29,23 @@ ci: fmt vet lint check-docs coverage e2e-test
 AUTHORS: .mailmap .git/HEAD
 	git log --format='%aN <%aE>' | sort -fu > $@
 
+# Handle file extension suffix (for Windows)
+EXE_EXT:=
+ifeq ($(OS),Windows_NT)
+	EXE_EXT:=.exe
+endif
+
 # Package list
 PKGS_AND_MOCKS := $(shell go list ./... | grep -v /vendor)
+ifeq ($(OS),Windows_NT)
+	# skip libvirt instance plugin on Windows (does not compile)
+	PKGS_AND_MOCKS := $(shell echo $(PKGS_AND_MOCKS) | tr ' ' '\n' | grep -v libvirt)
+endif
 PKGS := $(shell echo $(PKGS_AND_MOCKS) | tr ' ' '\n' | grep -v /mock$)
 PKGS_TEST := $(shell echo $(PKGS_AND_MOCKS) | tr ' ' '\n' | grep pkg$)
 
+
+
 get-tools:
 	@echo "+ $@"
 	@go get -u \
@@ -76,7 +88,7 @@ clean:
 
 define binary_target_template
 build/$(1): $(SRCS)
-	go build -o build/$(1) \
+	go build -o build/$(1)$(EXE_EXT) \
 		-ldflags "-X github.com/docker/infrakit/pkg/cli.Version=$(VERSION) -X github.com/docker/infrakit/pkg/cli.Revision=$(REVISION) -X github.com/docker/infrakit/pkg/util/docker.ClientVersion=$(DOCKER_CLIENT_VERSION)" $(2)
 endef
 define define_binary_target
@@ -99,7 +111,12 @@ $(call define_binary_target,infrakit-instance-file,github.com/docker/infrakit/ex
 $(call define_binary_target,infrakit-instance-gcp,github.com/docker/infrakit/cmd/instance/google)
 $(call define_binary_target,infrakit-instance-hyperkit,github.com/docker/infrakit/cmd/instance/hyperkit)
 $(call define_binary_target,infrakit-instance-image,github.com/docker/infrakit/cmd/instance/image)
+ifeq ($(OS),Windows_NT)
+build/infrakit-instance-libvirt:
+# noop on windows
+else
 $(call define_binary_target,infrakit-instance-libvirt,github.com/docker/infrakit/cmd/instance/libvirt)
+endif
 $(call define_binary_target,infrakit-instance-maas,github.com/docker/infrakit/examples/instance/maas)
 $(call define_binary_target,infrakit-instance-packet,github.com/docker/infrakit/cmd/instance/packet)
 $(call define_binary_target,infrakit-instance-terraform,github.com/docker/infrakit/pkg/provider/terraform/instance/cmd)

pkg/launch/os/os_test.go

@@ -5,6 +5,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
+	"strings"
 	"testing"
 	"time"
 
@@ -14,12 +16,15 @@ import (
 )
 
 func TestLaunchOSCommand(t *testing.T) {
-
+	sleepCmd := "sleep 100"
+	if runtime.GOOS == "windows" {
+		sleepCmd = "timeout 100"
+	}
 	launcher, err := NewLauncher("os")
 	require.NoError(t, err)
 
 	_, starting, err := launcher.Exec("sleepPlugin", plugin.Name("sleepPlugin"), types.AnyValueMust(&LaunchConfig{
-		Cmd: "sleep 100",
+		Cmd: sleepCmd,
 	}))
 	require.NoError(t, err)
 
@@ -47,5 +52,5 @@ func TestLaunchWithLog(t *testing.T) {
 
 	v, err := ioutil.ReadFile(logfile)
 	require.NoError(t, err)
-	require.Equal(t, "hello\n", string(v))
+	require.Equal(t, "hello", strings.TrimSpace(string(v)))
 }

pkg/launch/os/os_windows.go

@@ -0,0 +1,32 @@
+package os
+
+import (
+	"os/exec"
+	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/infrakit/pkg/launch"
+)
+
+func start(executor launch.Exec, name, sh string, setPgID bool) <-chan error {
+	block := make(chan error)
+
+	go func() {
+
+		defer close(block)
+
+		log.Infoln("OS(", executor.Name(), ") launcher: Plugin", name, "setPgId=", setPgID, "starting", sh)
+		cmd := exec.Command("cmd", "/s", "/c", sh)
+
+		log.Infoln("Running", cmd.Path, strings.Join(cmd.Args, " "))
+
+		err := cmd.Start()
+		log.Infoln("Starting with", err, "sh=", sh)
+		if err != nil {
+			log.Warningln("OS launcher: Plugin", name, "failed to start:", err, "cmd=", sh)
+			block <- err
+		}
+	}()
+
+	return block
+}