diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..d207b1802 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.go text eol=lf diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 26e4d743c..700c12f75 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,57 +8,23 @@ on: - v* jobs: - test-linux: - name: Test (Linux) - runs-on: ubuntu-latest - steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: 1.20.x - - name: Check out code into the Go module directory - uses: actions/checkout@v4 - - uses: golangci/golangci-lint-action@v3 - - run: make convention - - run: make cover - - run: test "$(gofmt -l . | wc -l)" = 0 - - uses: shogo82148/actions-goveralls@v1 - with: - path-to-profile: .profile.cov - - test-windows: - name: Test (Windows) - # Please do not specify `windows-latest` - # Build process is complex then need to check operation. - runs-on: windows-2022 - steps: - - uses: actions/checkout@v4 - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.20.x - - - uses: golangci/golangci-lint-action@v3 - with: - args: --timeout 5m - - uses: actions/cache@v3 - with: - path: | - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**\go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Run Test - run: | - go test -short ./... - shell: bash + lint: + uses: mackerelio/workflows/.github/workflows/go-lint.yml@v1.1.0 + convention: + uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.1.0 + with: + run: make convention + test: + uses: mackerelio/workflows/.github/workflows/go-test.yml@v1.1.0 + with: + # Please do not specify `windows-latest` + # Build process is complex then need to check operation. + os-versions: '["ubuntu-latest", "windows-2022"]' build-linux: name: Build (Linux) runs-on: ubuntu-latest - needs: test-linux + needs: test if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') env: DEBIAN_FRONTEND: noninteractive @@ -95,7 +61,7 @@ jobs: build-windows: name: Build (Windows) runs-on: windows-2022 - needs: test-windows + needs: test if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') strategy: matrix: diff --git a/.gitignore b/.gitignore index 43868cb9c..65ea65feb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ !.circleci !.dependabot !.github +!.gitattributes !.gitignore !.goxc.json !.travis.yml diff --git a/.golangci.yml b/.golangci.yml index 571d18bff..ed7b28d12 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,9 @@ +linters: + enable: + - gofmt +linters-settings: + gofmt: + simplify: true issues: exclude-rules: - path: _test\.go diff --git a/command/command_test.go b/command/command_test.go index 4899da840..1de72cec9 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -240,10 +240,10 @@ func TestCollectHostParamWithChecks(t *testing.T) { customIdentifier := "app.example.com" conf := config.Config{ CheckPlugins: map[string]*config.CheckPlugin{ - "chk1": &config.CheckPlugin{ + "chk1": { CustomIdentifier: nil, }, - "chk2": &config.CheckPlugin{ + "chk2": { CustomIdentifier: &customIdentifier, }, }, diff --git a/metrics/agent.go b/metrics/agent.go index cc08f8e87..f486e9495 100644 --- a/metrics/agent.go +++ b/metrics/agent.go @@ -37,7 +37,7 @@ func (g *AgentGenerator) CustomIdentifier() *string { func (g *AgentGenerator) PrepareGraphDefs() ([]*mkr.GraphDefsParam, error) { meta := &pluginMeta{ Graphs: map[string]customGraphDef{ - "agent.memory": customGraphDef{ + "agent.memory": { Label: "Agent Memory", Unit: "bytes", Metrics: []customGraphMetricDef{ @@ -47,7 +47,7 @@ func (g *AgentGenerator) PrepareGraphDefs() ([]*mkr.GraphDefsParam, error) { {Name: "heapSys", Label: "Heap Sys"}, }, }, - "agent.runtime": customGraphDef{ + "agent.runtime": { Label: "Agent Runtime", Unit: "integer", Metrics: []customGraphMetricDef{