Merge pull request #188 from devimc/2021-07-21/gomods

Support golang 1.16

.github/workflows/main.yml

@@ -4,37 +4,20 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.13.x, 1.14.x, 1.15.x]
+        go-version: [1.15.x, 1.16.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
-    env:
-      GO111MODULE: off
     steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Setup GOPATH
-      run: |
-        gopath_org=$(go env GOPATH)/src/github.com/kata-containers/
-        mkdir -p ${gopath_org}
-        ln -s ${PWD} ${gopath_org}
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Install gometalinter
-      run: |
-        go get github.com/alecthomas/gometalinter
-        $(go env GOPATH)/bin/gometalinter --install
-    - name: Running gometalinter
-      run: |
-        gopath_repo=$(go env GOPATH)/src/github.com/kata-containers/govmm
-        pushd ${gopath_repo}
-        $(go env GOPATH)/bin/gometalinter --tests --vendor --disable-all --enable=misspell --enable=vet --enable=ineffassign --enable=gofmt --enable=gocyclo --cyclo-over=15 --enable=golint --enable=errcheck --enable=deadcode --enable=staticcheck -enable=gas ./...
-    - name: Send coverage
-      env:
-        COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        gopath_repo=$(go env GOPATH)/src/github.com/kata-containers/govmm
-        pushd ${gopath_repo}
-        go get github.com/mattn/goveralls
-        $(go env GOPATH)/bin/goveralls -v -service=github
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          args: -c .golangci.yml -v
+      - name: go test
+        run: go test ./...

.golangci.yml

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+run:
+  concurrency: 4
+  deadline: 600s
+  skip-dirs:
+    - vendor
+# Ignore auto-generated protobuf code.
+  skip-files:
+    - ".*\\.pb\\.go$"
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - gocyclo
+    - gofmt
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unconvert
+    - unused
+    - varcheck
+
+linters-settings:
+  gocyclo:
+    min_complexity: 15
+  unused:
+    check-exported: true

go.mod

@@ -0,0 +1,3 @@
+module github.com/kata-containers/govmm
+
+go 1.16

qemu/qemu.go

@@ -1153,7 +1153,7 @@ func (blkdev BlockDevice) QemuParams(config *Config) []string {
 	}
 
 	if blkdev.ShareRW {
-		deviceParams = append(deviceParams, fmt.Sprintf("share-rw=on"))
+		deviceParams = append(deviceParams, "share-rw=on")
 	}
 
 	deviceParams = append(deviceParams, fmt.Sprintf("serial=%s", blkdev.ID))
@@ -1905,7 +1905,7 @@ func (vsock VSOCKDevice) QemuParams(config *Config) []string {
 	var qemuParams []string
 
 	driver := vsock.deviceName(config)
-	deviceParams = append(deviceParams, string(driver))
+	deviceParams = append(deviceParams, driver)
 	if s := vsock.Transport.disableModern(config, vsock.DisableModern); s != "" {
 		deviceParams = append(deviceParams, s)
 	}
@@ -2080,7 +2080,7 @@ func (b BalloonDevice) QemuParams(config *Config) []string {
 		deviceParams = append(deviceParams, "deflate-on-oom=off")
 	}
 	if s := b.Transport.disableModern(config, b.DisableModern); s != "" {
-		deviceParams = append(deviceParams, string(s))
+		deviceParams = append(deviceParams, s)
 	}
 	qemuParams = append(qemuParams, "-device")
 	qemuParams = append(qemuParams, strings.Join(deviceParams, ","))

qemu/qemu_test.go

@@ -391,7 +391,7 @@ func TestAppendVirtioRng(t *testing.T) {
 		ROMFile: romfile,
 	}
 
-	deviceString += "-" + string(rngDevice.Transport.getName(nil)) + ",rng=rng0"
+	deviceString += "-" + rngDevice.Transport.getName(nil) + ",rng=rng0"
 	if romfile != "" {
 		deviceString = deviceString + ",romfile=efi-virtio.rom"
 	}