ci: enables gofmt linter of golangci

mackerelio · Feb 27, 2024 · b154eea · b154eea
1 parent 15310ca
commit b154eea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -13,10 +13,7 @@ jobs:
   convention:
     uses: mackerelio/workflows/.github/workflows/setup-go-matrix.yml@v1.1.0
     with:
-      run: |
-        make convention
-        # TODO: use gofmt linter
-        test "$(gofmt -l . | wc -l)" -eq 0
+      run: make convention
   test:
     uses: mackerelio/workflows/.github/workflows/go-test.yml@v1.1.0
     with:

diff --git 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
@@ -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
@@ -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{