Merge pull request mackerelio#678 from mackerelio/lint-os

yseto · web-flow · commit 95fb8d274592 · 2022-12-29T17:22:21.000+09:00
combine lint, lint-windows, fix test on windows.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,29 +14,20 @@ jobs:
   lint:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: golangci/golangci-lint-action@v3
-  lint-windows:
-    strategy:
-      matrix:
-        os: [windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: golangci/golangci-lint-action@v3
         with:
-          args: --timeout 2m ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/...
+          args: --timeout 5m
   test:
     strategy:
       matrix:
         go: ["1.19.x", "1.18.x"]
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - run: sudo apt-get install memcached
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
@@ -49,8 +40,20 @@ jobs:
             ${{ runner.os }}-go-
       - run: |
           go test -race -covermode=atomic -coverprofile=prof.out ./...
+        shell: bash
+      - if: matrix.os == 'ubuntu-latest'
+        run: |
           ./test.bash
           make testconvention
+      - if: matrix.os == 'windows-latest'
+        run: |
+          go build -o check-log/check-log.exe ./check-log
+          go build -o check-procs/check-procs.exe ./check-procs
+          go build -o check-windows-eventlog/check-windows-evenglog.exe ./check-windows-eventlog
+          go build -o check-ntservice/check-ntservice.exe ./check-ntservice
+          go build -o check-disk/check-disk.exe ./check-disk
+          go build -o check-uptime/check-uptime.exe ./check-uptime
+          go build -o check-tcp/check-tcp.exe ./check-tcp
       - uses: shogo82148/actions-goveralls@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -65,29 +68,8 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         parallel-finished: true
-  test-windows:
-    strategy:
-      matrix:
-        go: ["1.19.x", "1.18.x"]
-    runs-on: windows-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go }}
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - run: |
-          go build -o check-log/check-log.exe ./check-log
-          go build -o check-procs/check-procs.exe ./check-procs
-          go build -o check-windows-eventlog/check-windows-evenglog.exe ./check-windows-eventlog
-          go test ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/...
   build:
-    needs: [test, test-windows]
+    needs: test
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
     steps:
diff --git a/check-aws-cloudwatch-logs/lib/check-aws-cloudwatch-logs_test.go b/check-aws-cloudwatch-logs/lib/check-aws-cloudwatch-logs_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkawscloudwatchlogs
 
 import (
diff --git a/check-file-size/lib/check_file_size.go b/check-file-size/lib/check_file_size.go
@@ -72,7 +72,8 @@ func listFiles(base string, depth int) ([]string, error) {
 		}
 
 		rel, _ := filepath.Rel(base, path)
-		if len(strings.Split(rel, "/")) > depth {
+		s := string(filepath.Separator)
+		if len(strings.Split(rel, s)) > depth {
 			return nil
 		}
 		files = append(files, path)
diff --git a/check-file-size/lib/check_file_size_test.go b/check-file-size/lib/check_file_size_test.go
@@ -2,6 +2,7 @@ package checkfilesize
 
 import (
 	"fmt"
+	"path/filepath"
 	"reflect"
 	"sort"
 	"testing"
@@ -53,12 +54,13 @@ func TestSizeValueWithInvalidInput(t *testing.T) {
 }
 
 func TestListFiles(t *testing.T) {
+	s := string(filepath.Separator)
 	// map[depth] = expected files
 	var testData = map[int][]string{
-		1: []string{"test_dir/file1"},
-		2: []string{"test_dir/file1", "test_dir/depth1/file2"},
-		3: []string{"test_dir/file1", "test_dir/depth1/file2", "test_dir/depth1/depth2/file3"},
-		4: []string{"test_dir/file1", "test_dir/depth1/file2", "test_dir/depth1/depth2/file3"},
+		1: {"test_dir" + s + "file1"},
+		2: {"test_dir" + s + "file1", "test_dir" + s + "depth1" + s + "file2"},
+		3: {"test_dir" + s + "file1", "test_dir" + s + "depth1" + s + "file2", "test_dir" + s + "depth1" + s + "depth2" + s + "file3"},
+		4: {"test_dir" + s + "file1", "test_dir" + s + "depth1" + s + "file2", "test_dir" + s + "depth1" + s + "depth2" + s + "file3"},
 	}
 	for depth, expects := range testData {
 		files, err := listFiles("test_dir", depth)
diff --git a/check-ldap/lib/check_ldap_test.go b/check-ldap/lib/check_ldap_test.go
@@ -1,4 +1,4 @@
-// +build docker
+//go:build docker
 
 package checkldap
 
diff --git a/check-load/lib/check_load.go b/check-load/lib/check_load.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkload
 
 import (
diff --git a/check-load/lib/check_load_netbsd.go b/check-load/lib/check_load_netbsd.go
@@ -1,12 +1,12 @@
 package checkload
 
 import (
-  "github.com/mackerelio/go-osstat/loadavg"
+	"github.com/mackerelio/go-osstat/loadavg"
 )
 
 func getloadavg() (loadavgs [3]float64, err error) {
-  output, err := loadavg.Get()
-  loadavgs = [3]float64{output.Loadavg1,output.Loadavg5,output.Loadavg15}
+	output, err := loadavg.Get()
+	loadavgs = [3]float64{output.Loadavg1, output.Loadavg5, output.Loadavg15}
 
-  return loadavgs, nil
+	return loadavgs, nil
 }
diff --git a/check-load/lib/check_load_windows.go b/check-load/lib/check_load_windows.go
@@ -0,0 +1,8 @@
+//go:build windows
+
+package checkload
+
+// Do the plugin
+func Do() {
+	panic("The check-load does not work on Windows environment.")
+}
diff --git a/check-log/lib/check-log_unix.go b/check-log/lib/check-log_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package checklog
 
diff --git a/check-log/lib/check-log_unix_test.go b/check-log/lib/check-log_unix_test.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package checklog
 
diff --git a/check-masterha/lib/check_masterha_repl_test.go b/check-masterha/lib/check_masterha_repl_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkmasterha
 
 import (
diff --git a/check-masterha/lib/check_masterha_ssh_test.go b/check-masterha/lib/check_masterha_ssh_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkmasterha
 
 import (
@@ -96,4 +98,3 @@ SSH Configuration Check Failed!
 	assert.Equal(t, checkers.CRITICAL, status)
 	assert.Equal(t, "SSH Configuration Check Failed!", msg)
 }
-
diff --git a/check-masterha/lib/check_masterha_status_test.go b/check-masterha/lib/check_masterha_status_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkmasterha
 
 import (
@@ -32,4 +34,3 @@ func TestParseStatusFailure(t *testing.T) {
 	assert.Equal(t, checkers.CRITICAL, status)
 	assert.Equal(t, "db001 is stopped(2:NOT_RUNNING).", msg)
 }
-
diff --git a/check-masterha/lib/check_masterha_test.go b/check-masterha/lib/check_masterha_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package checkmasterha
 
 import (
diff --git a/check-masterha/lib/mock/masterha.go b/check-masterha/lib/mock/masterha.go
@@ -4,14 +4,13 @@ import (
 	"github.com/mackerelio/checkers"
 )
 
-
 // Executer is dummy executer for testing
 type Executer struct {
-	CommandName string
-	CommandArgs []string
+	CommandName   string
+	CommandArgs   []string
 	CommandResult string
-	Status checkers.Status
-	ParseResult string
+	Status        checkers.Status
+	ParseResult   string
 }
 
 // MakeCommandName is dummy command name maker for testing
diff --git a/check-ntservice/lib/check_ntservice_others.go b/check-ntservice/lib/check_ntservice_others.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package checkntservice
 
diff --git a/check-ntservice/lib/check_ntservice_windows.go b/check-ntservice/lib/check_ntservice_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package checkntservice
 
diff --git a/check-procs/lib/check_procs_unix.go b/check-procs/lib/check_procs_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package checkprocs
 
diff --git a/check-tcp/lib/check-tcp_test.go b/check-tcp/lib/check-tcp_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"runtime"
 	"strconv"
 	"testing"
 	"time"
@@ -221,6 +222,9 @@ func TestHTTP(t *testing.T) {
 }
 
 func TestUnixDomainSocket(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skipping test on windows")
+	}
 	dir, err := ioutil.TempDir(os.TempDir(), "")
 	if err != nil {
 		t.Error(err)
diff --git a/check-windows-eventlog/lib/check-windows-eventlog.go b/check-windows-eventlog/lib/check-windows-eventlog.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package checkwindowseventlog
 
diff --git a/check-windows-eventlog/lib/check-windows-eventlog_other.go b/check-windows-eventlog/lib/check-windows-eventlog_other.go
@@ -1,9 +1,8 @@
-// +build !windows
+//go:build !windows
 
 package checkwindowseventlog
 
 // Do the plugin
 func Do() {
 	panic("The check-windows-eventlog does not work on non Windows environment, of cource.")
 }
-
diff --git a/check-windows-eventlog/lib/check_windows_eventlog_test.go b/check-windows-eventlog/lib/check_windows_eventlog_test.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package checkwindowseventlog
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build !windows`
	`2`	`+`
`1`	`3`	`package checkawscloudwatchlogs`
`2`	`4`
`3`	`5`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ func listFiles(base string, depth int) ([]string, error) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`rel, _ := filepath.Rel(base, path)`
`75`		`- if len(strings.Split(rel, "/")) > depth {`
	`75`	`+ s := string(filepath.Separator)`
	`76`	`+ if len(strings.Split(rel, s)) > depth {`
`76`	`77`	`return nil`
`77`	`78`	`}`
`78`	`79`	`files = append(files, path)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build docker`
	`1`	`+//go:build docker`
`2`	`2`
`3`	`3`	`package checkldap`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build !windows`
	`2`	`+`
`1`	`3`	`package checkload`
`2`	`4`
`3`	`5`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`package checkload`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/mackerelio/go-osstat/loadavg"`
	`4`	`+ "github.com/mackerelio/go-osstat/loadavg"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func getloadavg() (loadavgs [3]float64, err error) {`
`8`		`- output, err := loadavg.Get()`
`9`		`- loadavgs = [3]float64{output.Loadavg1,output.Loadavg5,output.Loadavg15}`
	`8`	`+ output, err := loadavg.Get()`
	`9`	`+ loadavgs = [3]float64{output.Loadavg1, output.Loadavg5, output.Loadavg15}`
`10`	`10`
`11`		`- return loadavgs, nil`
	`11`	`+ return loadavgs, nil`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !windows`
	`1`	`+//go:build !windows`
`2`	`2`
`3`	`3`	`package checklog`
`4`	`4`