Switch from gometalinter to golangci-lint (#105)

switch from gometalinter to golangci-lint

Author: Gustav Paul

Dockerfile

@@ -36,13 +36,12 @@ RUN rm -rf /usr/local/go && \
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 ENV PATH /usr/local/go/bin:$PATH
+ENV GOLANGCI_LINT_VERSION v1.17.1
 
-RUN mkdir -p /go/src/github.com/alecthomas && \
-    cd /go/src/github.com/alecthomas && \
-    git clone https://github.com/alecthomas/gometalinter.git --branch=v1.2.1 && \
-    go install -v github.com/alecthomas/gometalinter && \
-    gometalinter --install && \
-    go get -u golang.org/x/tools/cmd/goimports && \
+RUN mkdir -p /go/src/github.com/golangci/ && \
+    cd /go/src/github.com/golangci && \
+    git clone https://github.com/golangci/golangci-lint.git --branch=$GOLANGCI_LINT_VERSION && \
+    go install -v github.com/golangci/golangci-lint/cmd/golangci-lint && \
     mkdir -p /go/src/github.com/mesosphere/csilvm
 
 # We explicitly disable use of lvmetad as the cache appears to yield inconsistent results,

Makefile

@@ -58,7 +58,7 @@ shell: dev-image
 endif
 
 check:
-	$(BUILD_PREFIX) sh -c "go build -v ./... && gometalinter --config=gometalinter.conf --vendor ./..."
+	$(BUILD_PREFIX) sh -c "go build -v ./... && golangci-lint run -E=goimports -E=gofmt"
 
 build:
 	$(BUILD_PREFIX) go build -ldflags "$(LDFLAGS)" ./cmd/csilvm

cmd/csilvm/csilvm.go

@@ -95,14 +95,14 @@ func main() {
 	if *socketFileEnvF != "" {
 		sock = os.Getenv(*socketFileEnvF)
 	}
-	if strings.HasPrefix(sock, "unix://") {
-		sock = sock[len("unix://"):]
-	}
+	sock = strings.TrimPrefix(sock, "unix://")
 	// Unlink the domain socket in case it is left lying around from a
 	// previous run. err return is not really interesting because it is
 	// normal for this to fail if the process is starting for the first time.
-	logger.Printf("Unlinking socket file: %q", sock)
-	syscall.Unlink(sock)
+	logger.Printf("Unlinking socket file in case it still exists: %q", sock)
+	if err := syscall.Unlink(sock); err != nil {
+		logger.Printf("Failed to unlink socket file: %v", err)
+	}
 	// Setup socket listener
 	lis, err := net.Listen("unix", sock)
 	if err != nil {
@@ -212,5 +212,7 @@ func main() {
 	csi.RegisterIdentityServer(grpcServer, csilvm.IdentityServerValidator(s))
 	csi.RegisterControllerServer(grpcServer, csilvm.ControllerServerValidator(s, s.RemovingVolumeGroup(), s.SupportedFilesystems()))
 	csi.RegisterNodeServer(grpcServer, csilvm.NodeServerValidator(s, s.RemovingVolumeGroup(), s.SupportedFilesystems()))
-	grpcServer.Serve(lis)
+	if err := grpcServer.Serve(lis); err != nil {
+		logger.Fatalf("Stopped serving, err=%v", err)
+	}
 }