Merge pull request #104 from section/run-tests-on-windows

Make tests run on Windows

Author: Lindsay Holmwood

.github/workflows/release.yml

@@ -50,10 +50,6 @@ jobs:
     - name: Get dependencies
       run: |
         go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
 
     - name: Get version from tag ref
       id: get_version_from_tag

.github/workflows/test.yml

@@ -10,9 +10,13 @@ jobs:
 
   test:
     name: Run test suite
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: windows-latest
+          - os: ubuntu-latest
     steps:
-
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
@@ -25,10 +29,6 @@ jobs:
     - name: Get dependencies
       run: |
         go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
 
     - name: Test
       env:

sectionctl.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/url"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/alecthomas/kong"
@@ -32,6 +33,7 @@ type CLI struct {
 	Version            commands.VersionCmd          `cmd help:"Print sectionctl version"`
 	WhoAmI             commands.WhoAmICmd           `cmd name:"whoami" help:"Show information about the currently authenticated user"`
 	Debug              bool                         `env:"DEBUG" help:"Enable debug output"`
+	DebugFileDir       string                       `default:"." help:"Directory where debug output should be written"`
 	SectionToken       string                       `env:"SECTION_TOKEN" help:"Secret token for API auth"`
 	SectionAPIPrefix   *url.URL                     `default:"https://aperture.section.io" env:"SECTION_API_PREFIX"`
 	SectionAPITimeout  time.Duration                `default:"30s" env:"SECTION_API_TIMEOUT" help:"Request timeout for the Section API"`
@@ -51,16 +53,17 @@ func bootstrap(c CLI, ctx *kong.Context) {
 	}
 	if c.Debug {
 		filter.MinLevel = logutils.LogLevel("DEBUG")
-		logFilename := fmt.Sprintf("sectionctl-debug-%s.log", time.Now().Format(time.RFC3339))
-		logFile, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
+		logFilename := fmt.Sprintf("sectionctl-debug-%s.log", time.Now().Format("2006-01-02-15-04-05Z0700"))
+		logFilePath := filepath.Join(c.DebugFileDir, logFilename)
+		logFile, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
 		if err != nil {
 			panic(err)
 		}
 		fmt.Fprintf(logFile, "Version:   %s\n", commands.VersionCmd{}.String())
 		fmt.Fprintf(logFile, "Command:   %s\n", ctx.Args)
 		fmt.Fprintf(logFile, "PrefixURI: %s\n", api.PrefixURI)
 		fmt.Fprintf(logFile, "Timeout:   %s\n", api.Timeout)
-		fmt.Printf("Writing debug log to: %s\n", logFilename)
+		fmt.Printf("Writing debug log to: %s\n", logFilePath)
 		mw := io.MultiWriter(logFile, colorableWriter)
 		filter.Writer = mw
 	}

sectionctl_test.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"io/ioutil"
+	"net/url"
+	"path/filepath"
+	"testing"
+
+	"github.com/alecthomas/kong"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBootstrapSetsUpDebugLogFile(t *testing.T) {
+	assert := assert.New(t)
+
+	// Setup
+	u, err := url.Parse("https://aperture.section.io")
+	assert.NoError(err)
+	d, err := ioutil.TempDir("", "sectionctl")
+	assert.NoError(err)
+
+	var cli = CLI{Debug: true, SectionToken: "s3cr3t", SectionAPIPrefix: u, DebugFileDir: d}
+	var ctx kong.Context
+
+	// Invoke
+	bootstrap(cli, &ctx)
+
+	// Test
+	m, err := filepath.Glob(filepath.Join(d, "*.log"))
+	assert.NoError(err)
+	assert.Greater(len(m), 0)
+}