Build Dunner and run tests with Github Actions

.github/workflows/main.yml

@@ -0,0 +1,63 @@
+name: Dunner CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+    steps:
+    - name: Setup Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: '1.11.x'
+
+    - name: Checkout Dunner
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+
+    - name: Debug
+      if: matrix.os == 'windows-latest'
+      run: |
+        pwd
+        echo gopath: %GOPATH%
+        go env GOPATH
+        ls %GOPATH%
+
+    - name: Debug
+      if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
+      run: |
+        pwd
+        echo $GOPATH
+        go env GOPATH
+        ls $GOPATH
+
+    - name: Build Dunner and run unit tests
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        make setup
+        make ci
+        $(go env GOPATH)/bin/dunner version
+        $(go env GOPATH)/bin/dunner do show
+
+    - name: Build Dunner and run unit tests
+      if: matrix.os == 'macOS-latest'
+      # Not running unit tests in mac since there is no docker support via github actions
+      run: |
+        make setup
+        make fmt lint vet install
+        $(go env GOPATH)/bin/dunner version
+        $(go env GOPATH)/bin/dunner do show
+
+    # Not using make ci in windows because test-image is not working for windows as busybox image is not available
+    - name: Build Dunner and run unit tests
+      if: matrix.os == 'windows-latest'
+      run: |
+        make setup
+        make fmt lint vet
+        go test -v ./...
+        %GOPATH%bin\dunner version
+        %GOPATH%bin\dunner do show

Makefile

@@ -12,13 +12,15 @@ GO_FILES=$(ALL_PACKAGES)
 
 #Hooks
 PRECOMMIT_HOOK="./resources/git-hooks/pre-commit"
-
 TEST_IMAGE_DIR="./resources/test-image/"
 
 #Go parameters
 GOCMD=go
 GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
+GOPATH=$(shell go env GOPATH)
+DEP=$(GOPATH)/bin/dep
+GOLINT=$(GOPATH)/bin/golint
 .PHONY : all install vet fmt test lint build
 
 all: build test fmt lint vet
@@ -49,7 +51,7 @@ fmt:
 	@go fmt $(ALL_PACKAGES)
 
 lint:
-	@golint -set_exit_status $(GO_FILES)
+	@$(GOLINT) -set_exit_status $(GO_FILES)
 
 precommit: build test fmt lint vet
 

internal/util/util.go

@@ -8,17 +8,26 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"os/user"
 	"path"
 	"strings"
 	"time"
 
 	"github.com/leopardslab/dunner/internal/logger"
 )
 
-var log = logger.Log
+func init() {
+	user, err := user.Current()
+	if err != nil {
+		panic(err)
+	}
+	HomeDir = user.HomeDir
+}
 
 // HomeDir is the environment variable HOME
-var HomeDir = os.Getenv("HOME")
+var HomeDir string
+var log = logger.Log
+
 var userDir = os.Getenv("user")
 
 // progressReader is for indicating the download / upload progress on the console

pkg/config/config.go

@@ -184,7 +184,7 @@ func ValidateMountDir(ctx context.Context, fl validator.FieldLevel) bool {
 	}
 	validPerm := false
 	for _, perm := range validDirPermissionModes {
-		if mountValues[2] == perm {
+		if mountValues[len(mountValues)-1] == perm {
 			validPerm = true
 		}
 	}

pkg/config/config_test.go

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"reflect"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -207,27 +209,14 @@ func TestConfigs_ValidateWithInvalidMountFormat(t *testing.T) {
 	}
 }
 
+// FIXME: Skipped in Windows. Since paths with colon is not incorporated in Dunner, this will not possible for now.
 func TestConfigs_ValidateWithValidMountDirectory(t *testing.T) {
-	step := getSampleStep()
-	wd, _ := os.Getwd()
-	step.Mounts = []string{fmt.Sprintf("%s:%s:w", wd, wd)}
-	var tasks = make(map[string]Task)
-	tasks["stats"] = Task{Steps: []Step{step}}
-	var configs = &Configs{
-		Tasks: tasks,
+	if runtime.GOOS == "windows" {
+		return
 	}
-
-	errs := configs.Validate()
-
-	if errs != nil {
-		t.Fatalf("expected no errors, got %s", errs)
-	}
-}
-
-func TestConfigs_ValidateWithMountDirFromEnv(t *testing.T) {
 	step := getSampleStep()
 	wd, _ := os.Getwd()
-	step.Mounts = []string{fmt.Sprintf("%s:%s:w", wd, wd)}
+	step.Mounts = []string{fmt.Sprintf("%s:/app:w", wd)}
 	var tasks = make(map[string]Task)
 	tasks["stats"] = Task{Steps: []Step{step}}
 	var configs = &Configs{
@@ -241,10 +230,14 @@ func TestConfigs_ValidateWithMountDirFromEnv(t *testing.T) {
 	}
 }
 
+// FIXME: Skipped in Windows. Since paths with colon is not incorporated in Dunner, this will not possible for now.
 func TestConfigs_ValidateWithNoModeGiven(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		return
+	}
 	step := getSampleStep()
 	wd, _ := os.Getwd()
-	step.Mounts = []string{fmt.Sprintf("%s:%s", wd, wd)}
+	step.Mounts = []string{fmt.Sprintf("%s:/app", wd)}
 	var tasks = make(map[string]Task)
 	tasks["stats"] = Task{Steps: []Step{step}}
 	var configs = &Configs{
@@ -388,6 +381,9 @@ func TestInitValidatorForEmptyTag(t *testing.T) {
 	}
 }
 
+var dummyEnvName = "DUNNER_TEST_ENV"
+var dummyEnvValue = "DUNNER_TEST_ENV_VALUE"
+
 var lookupEnvtests = []struct {
 	in  string
 	out string
@@ -397,14 +393,14 @@ var lookupEnvtests = []struct {
 	{"foo", "foo", nil},
 	{"/foo/bar", "/foo/bar", nil},
 	{"/foo/`$bar", "/foo/`$bar", nil},
-	{util.HomeDir, util.HomeDir, nil},
-	{"`$HOME`", util.HomeDir, nil},
-	{"`$HOME`/foo", util.HomeDir + "/foo", nil},
-	{"`$HOME`/foo/`$HOME`", util.HomeDir + "/foo/" + util.HomeDir, nil},
+	{"`$DUNNER_TEST_ENV`", dummyEnvValue, nil},
+	{"`$DUNNER_TEST_ENV`/foo", fmt.Sprintf("%s/foo", dummyEnvValue), nil},
+	{"`$DUNNER_TEST_ENV`/foo/`$DUNNER_TEST_ENV`", fmt.Sprintf("%s/foo/%s", dummyEnvValue, dummyEnvValue), nil},
 	{"`$INVALID_TEST`/foo", "`$INVALID_TEST`/foo", fmt.Errorf("could not find environment variable 'INVALID_TEST'")},
 }
 
 func TestLookUpDirectory(t *testing.T) {
+	os.Setenv(dummyEnvName, dummyEnvValue)
 	for _, tt := range lookupEnvtests {
 		t.Run(tt.in, func(t *testing.T) {
 			parsedDir, err := lookupDirectory(tt.in)
@@ -420,7 +416,9 @@ func TestLookUpDirectory(t *testing.T) {
 
 func TestDecodeMount(t *testing.T) {
 	step := &docker.Step{}
-	mounts := []string{fmt.Sprintf("%s:/app:r", util.HomeDir)}
+	currentDirName := "test_dir"
+	mounts := []string{fmt.Sprintf("%s:/app:r", currentDirName)}
+	absEnv, _ := filepath.Abs(currentDirName)
 
 	err := DecodeMount(mounts, step)
 
@@ -433,14 +431,15 @@ func TestDecodeMount(t *testing.T) {
 	if len((*step).ExtMounts) != 1 {
 		t.Fatalf("expected ExtMounts to be of length 1, got %d", len((*step).ExtMounts))
 	}
-	if (*step).ExtMounts[0].Source != util.HomeDir {
-		t.Fatalf("expected ExtMounts to be %s, got %s", util.HomeDir, (*step).ExtMounts[0].Source)
+	if (*step).ExtMounts[0].Source != absEnv {
+		t.Fatalf("expected ExtMounts Source to be %s, got %s", absEnv, (*step).ExtMounts[0].Source)
 	}
 }
 
-func TestDecodeMountWithEnvironmentVariable(t *testing.T) {
+func TestDecodeMountWithRelativeSource(t *testing.T) {
+	absEnv, _ := filepath.Abs(dummyEnvValue)
 	step := &docker.Step{}
-	mounts := []string{"/tmp:/app"}
+	mounts := []string{fmt.Sprintf("%s:%s", dummyEnvValue, dummyEnvValue)}
 
 	err := DecodeMount(mounts, step)
 
@@ -453,11 +452,11 @@ func TestDecodeMountWithEnvironmentVariable(t *testing.T) {
 	if len((*step).ExtMounts) != 1 {
 		t.Fatalf("expected ExtMounts to be of length 1, got %d", len((*step).ExtMounts))
 	}
-	if (*step).ExtMounts[0].Source != "/tmp" {
-		t.Fatalf("expected ExtMounts Source to be '/tmp', got %s", (*step).ExtMounts[0].Source)
+	if (*step).ExtMounts[0].Source != absEnv {
+		t.Fatalf("expected ExtMounts Source to be %s, got %s", absEnv, (*step).ExtMounts[0].Source)
 	}
-	if (*step).ExtMounts[0].Target != "/app" {
-		t.Fatalf("expected ExtMounts Source to be '/app', got %s", (*step).ExtMounts[0].Target)
+	if (*step).ExtMounts[0].Target != dummyEnvValue {
+		t.Fatalf("expected ExtMounts Source to be %s, got %s", dummyEnvValue, (*step).ExtMounts[0].Target)
 	}
 }
 

pkg/initialize/initialize_test.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/leopardslab/dunner/internal"
@@ -81,13 +82,13 @@ func TestInitializeFilenameIsInvalid(t *testing.T) {
 	defer revert()
 	var filename = "#Q$EJL_doesntexist/.test_dunner.yml"
 
-	expected := fmt.Sprintf("open %s: no such file or directory", filename)
+	expected := fmt.Sprintf("open %s: ", filename)
 	err := InitProject(filename, nil)
 	if err == nil {
-		t.Errorf("expected: %s, got nil", expected)
+		t.Errorf("expected error prefix: %s, got nil", expected)
 	}
-	if expected != err.Error() {
-		t.Errorf("expected: %s, got: %s", expected, err.Error())
+	if !strings.HasPrefix(err.Error(), expected) {
+		t.Errorf("expected prefix: %s, got: %s", expected, err.Error())
 	}
 }