Merge pull request #84 from pigletfly/fix-linter

Use revive instead of golint

Author: dmcgowan

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
 
       - uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.29
+          version: v1.45.2
           working-directory: src/github.com/containerd/go-runc
           args: --timeout=5m
           skip-go-installation: true

.golangci.yml

@@ -6,7 +6,7 @@ linters:
     - unconvert
     - gofmt
     - goimports
-    - golint
+    - revive
     - ineffassign
     - vet
     - unused

events.go

@@ -30,7 +30,7 @@ type Event struct {
 
 // Stats is statistical information from the runc process
 type Stats struct {
-	Cpu     Cpu                `json:"cpu"` //nolint:golint
+	Cpu     Cpu                `json:"cpu"` //revive:disable
 	Memory  Memory             `json:"memory"`
 	Pids    Pids               `json:"pids"`
 	Blkio   Blkio              `json:"blkio"`
@@ -78,7 +78,8 @@ type Throttling struct {
 }
 
 // CpuUsage represents the CPU usage statistics
-type CpuUsage struct { //nolint:golint
+//revive:disable-next-line
+type CpuUsage struct {
 	// Units: nanoseconds.
 	Total  uint64   `json:"total,omitempty"`
 	Percpu []uint64 `json:"percpu,omitempty"`
@@ -87,7 +88,8 @@ type CpuUsage struct { //nolint:golint
 }
 
 // Cpu represents the CPU usage and throttling statistics
-type Cpu struct { //nolint:golint
+//revive:disable-next-line
+type Cpu struct {
 	Usage      CpuUsage   `json:"usage,omitempty"`
 	Throttling Throttling `json:"throttling,omitempty"`
 }