Merge pull request #665 from nginx-proxy/multi-os-arch-tests

ci: run tests on multiple go versions and oses

Author: buchdag

.github/workflows/tests.yml

@@ -13,8 +13,19 @@ on:
 
 jobs:
   unit:
-    name: Unit Tests
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version:
+          - "1.23"
+          - "1.24"
+        os:
+          - macos
+          - ubuntu
+          - windows
+      fail-fast: false
+
+    name: Unit Tests (${{ matrix.os }}/go-${{ matrix.go-version }})
+    runs-on: ${{ matrix.os }}-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +34,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: ${{ matrix.go-version }}
 
       - name: Install dependencies
         run: make get-deps
@@ -32,7 +43,8 @@ jobs:
         run: make docker-gen
 
       - name: Check code formatting
+        if: runner.os != 'Windows'
         run: make check-gofmt
 
       - name: Run tests
-        run: go test -race -v ./internal/...
+        run: make test

Makefile

@@ -62,4 +62,4 @@ check-gofmt:
 	fi
 
 test:
-	go test -race ./internal/...
+	go test -v ./internal/...

internal/generator/generator_test.go

@@ -30,7 +30,7 @@ func TestGenerateFromEvents(t *testing.T) {
 {"status":"stop","id":"8dfafdbc3a40","from":"base:latest","time":1374067966}
 {"status":"start","id":"8dfafdbc3a40","from":"base:latest","time":1374067970}
 {"status":"destroy","id":"8dfafdbc3a40","from":"base:latest","time":1374067990}`
-	infoResponse := `{"Containers":1,"Images":1,"Debug":0,"NFd":11,"NGoroutines":21,"MemoryLimit":1,"SwapLimit":0}`
+	infoResponse := `{"Containers":1,"Images":1,"Debug":false,"NFd":11,"NGoroutines":21,"MemoryLimit":true,"SwapLimit":false}`
 	versionResponse := `{"Version":"1.8.0","Os":"Linux","KernelVersion":"3.18.5-tinycore64","GoVersion":"go1.4.1","GitCommit":"a8a31ef","Arch":"amd64","ApiVersion":"1.19"}`
 
 	server, _ := dockertest.NewServer("127.0.0.1:0", nil, nil)

internal/template/chown_unix.go

@@ -2,7 +2,7 @@ package template
 
 import (
 	"os"
-	"path"
+	"path/filepath"
 	"reflect"
 	"testing"
 
@@ -96,10 +96,28 @@ func TestInclude(t *testing.T) {
 	data := include("some_random_file")
 	assert.Equal(t, "", data)
 
-	_ = os.WriteFile("/tmp/docker-gen-test-temp-file", []byte("some string"), 0o777)
-	data = include("/tmp/docker-gen-test-temp-file")
+	f, err := os.CreateTemp("", "docker-gen-test-temp-file")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		f.Close()
+		os.Remove(f.Name())
+	}()
+
+	err = f.Chmod(0o644)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = f.WriteString("some string")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data = include(f.Name())
 	assert.Equal(t, "some string", data)
-	_ = os.Remove("/tmp/docker-gen-test-temp-file")
 }
 
 func TestIntersect(t *testing.T) {
@@ -225,9 +243,9 @@ func TestDirList(t *testing.T) {
 	}
 
 	expected := []string{
-		path.Base(files["aaa"]),
-		path.Base(files["bbb"]),
-		path.Base(files["ccc"]),
+		filepath.Base(files["aaa"]),
+		filepath.Base(files["bbb"]),
+		filepath.Base(files["ccc"]),
 	}
 
 	filesList, _ := dirList(dir)

internal/template/chown_windows.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
 	"net/url"
 	"os"
@@ -190,48 +191,17 @@ func GenerateFile(config config.Config, containers context.Context) bool {
 	}
 
 	if config.Dest != "" {
-		dest, err := os.CreateTemp(filepath.Dir(config.Dest), "docker-gen")
-		defer func() {
-			dest.Close()
-			os.Remove(dest.Name())
-		}()
-		if err != nil {
-			log.Fatalf("Unable to create temp file: %s\n", err)
-		}
-
-		if n, err := dest.Write(contents); n != len(contents) || err != nil {
-			log.Fatalf("Failed to write to temp file: wrote %d, exp %d, err=%v", n, len(contents), err)
-		}
-
-		oldContents := []byte{}
-		if fi, err := os.Stat(config.Dest); err == nil || os.IsNotExist(err) {
-			if err != nil && os.IsNotExist(err) {
-				emptyFile, err := os.Create(config.Dest)
-				if err != nil {
-					log.Fatalf("Unable to create empty destination file: %s\n", err)
-				} else {
-					emptyFile.Close()
-					fi, _ = os.Stat(config.Dest)
-				}
-			}
-
-			if err := dest.Chmod(fi.Mode()); err != nil {
-				log.Fatalf("Unable to chmod temp file: %s\n", err)
-			}
-
-			chown(dest, fi)
-
-			oldContents, err = os.ReadFile(config.Dest)
-			if err != nil {
-				log.Fatalf("Unable to compare current file contents: %s: %s\n", config.Dest, err)
-			}
+		oldContents, err := os.ReadFile(config.Dest)
+		if err != nil && !errors.Is(err, fs.ErrNotExist) {
+			log.Fatalf("Unable to compare current file contents: %s: %s\n", config.Dest, err)
 		}
 
 		if !bytes.Equal(oldContents, contents) {
-			err = os.Rename(dest.Name(), config.Dest)
+			err := os.WriteFile(config.Dest, contents, 0644)
 			if err != nil {
-				log.Fatalf("Unable to create dest file %s: %s\n", config.Dest, err)
+				log.Fatalf("Unable to write to dest file %s: %s\n", config.Dest, err)
 			}
+
 			log.Printf("Generated '%s' from %d containers", config.Dest, len(filteredContainers))
 			return true
 		}

internal/template/functions_test.go

@@ -1,6 +1,8 @@
 package utils
 
 import (
+	"errors"
+	"io/fs"
 	"os"
 	"strings"
 )
@@ -27,7 +29,7 @@ func PathExists(path string) (bool, error) {
 	if err == nil {
 		return true, nil
 	}
-	if os.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return false, nil
 	}
 	return false, err