Fixing linting errors

Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
opiproject · Feb 22, 2023 · 88edfc9 · 88edfc9
1 parent f352eec
commit 88edfc9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ RUN go mod download
 # build an app
 COPY cmd/ cmd/
 COPY pkg/ pkg/
-RUN go build -v -o /opi-spdk-bridge ./cmd/... && CGO_ENABLED=0 go test -v ./...
+RUN go build -v -o /opi-spdk-bridge ./cmd/...
 
 # second stage to reduce image size
 FROM alpine:3.17

diff --git a/pkg/backend/backend_test.go b/pkg/backend/backend_test.go
@@ -58,7 +58,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 			log.Fatal("accept error:", err)
 		}
 		log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
-		log.Printf("SPDK ID [%d]", server.RpcID)
+		log.Printf("SPDK ID [%d]", server.RPCID)
 
 		buf := make([]byte, 512)
 		nr, err := fd.Read(buf)
@@ -68,7 +68,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 
 		data := buf[0:nr]
 		if strings.Contains(spdk, "%") {
-			spdk = fmt.Sprintf(spdk, server.RpcID)
+			spdk = fmt.Sprintf(spdk, server.RPCID)
 		}
 
 		log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -88,10 +88,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
 // TODO: move to a separate (test/server) package to avoid duplication
 func startSpdkMockupServer() net.Listener {
 	// start SPDK mockup Server
-	if err := os.RemoveAll(*server.RpcSock); err != nil {
+	if err := os.RemoveAll(*server.RPCSock); err != nil {
 		log.Fatal(err)
 	}
-	ln, err := net.Listen("unix", *server.RpcSock)
+	ln, err := net.Listen("unix", *server.RPCSock)
 	if err != nil {
 		log.Fatal("listen error:", err)
 	}

diff --git a/pkg/frontend/frontend_test.go b/pkg/frontend/frontend_test.go
@@ -56,7 +56,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 			log.Fatal("accept error:", err)
 		}
 		log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
-		log.Printf("SPDK ID [%d]", server.RpcID)
+		log.Printf("SPDK ID [%d]", server.RPCID)
 
 		buf := make([]byte, 512)
 		nr, err := fd.Read(buf)
@@ -66,7 +66,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 
 		data := buf[0:nr]
 		if strings.Contains(spdk, "%") {
-			spdk = fmt.Sprintf(spdk, server.RpcID)
+			spdk = fmt.Sprintf(spdk, server.RPCID)
 		}
 
 		log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -86,10 +86,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
 // TODO: move to a separate (test/server) package to avoid duplication
 func startSpdkMockupServer() net.Listener {
 	// start SPDK mockup Server
-	if err := os.RemoveAll(*server.RpcSock); err != nil {
+	if err := os.RemoveAll(*server.RPCSock); err != nil {
 		log.Fatal(err)
 	}
-	ln, err := net.Listen("unix", *server.RpcSock)
+	ln, err := net.Listen("unix", *server.RPCSock)
 	if err != nil {
 		log.Fatal("listen error:", err)
 	}

diff --git a/pkg/middleend/middleend_test.go b/pkg/middleend/middleend_test.go
@@ -53,7 +53,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 			log.Fatal("accept error:", err)
 		}
 		log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
-		log.Printf("SPDK ID [%d]", server.RpcID)
+		log.Printf("SPDK ID [%d]", server.RPCID)
 
 		buf := make([]byte, 512)
 		nr, err := fd.Read(buf)
@@ -63,7 +63,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
 
 		data := buf[0:nr]
 		if strings.Contains(spdk, "%") {
-			spdk = fmt.Sprintf(spdk, server.RpcID)
+			spdk = fmt.Sprintf(spdk, server.RPCID)
 		}
 
 		log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -83,10 +83,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
 // TODO: move to a separate (test/server) package to avoid duplication
 func startSpdkMockupServer() net.Listener {
 	// start SPDK mockup Server
-	if err := os.RemoveAll(*server.RpcSock); err != nil {
+	if err := os.RemoveAll(*server.RPCSock); err != nil {
 		log.Fatal(err)
 	}
-	ln, err := net.Listen("unix", *server.RpcSock)
+	ln, err := net.Listen("unix", *server.RPCSock)
 	if err != nil {
 		log.Fatal("listen error:", err)
 	}

diff --git a/pkg/server/jsonrpc.go b/pkg/server/jsonrpc.go
@@ -16,19 +16,21 @@ import (
 )
 
 var (
-	RpcID   int32 // json request message ID, auto incremented
-	RpcSock = flag.String("rpc_sock", "/var/tmp/spdk.sock", "Path to SPDK JSON RPC socket")
+	// RPCID is json request message ID, auto incremented
+	RPCID int32
+	// RPCSock is unix domain socket to communicate with SPDK app or Vendor SDK
+	RPCSock = flag.String("rpc_sock", "/var/tmp/spdk.sock", "Path to SPDK JSON RPC socket")
 )
 
-// low level rpc request/response handling
+// Call implements low level rpc request/response handling
 func Call(method string, args, result interface{}) error {
 	type rpcRequest struct {
 		Ver    string `json:"jsonrpc"`
 		ID     int32  `json:"id"`
 		Method string `json:"method"`
 	}
 
-	id := atomic.AddInt32(&RpcID, 1)
+	id := atomic.AddInt32(&RPCID, 1)
 	request := rpcRequest{
 		Ver:    "2.0",
 		ID:     id,
@@ -57,7 +59,7 @@ func Call(method string, args, result interface{}) error {
 	log.Printf("Sending to SPDK: %s", data)
 
 	// TODO: add also web option: resp, _ = webSocketCom(rpcClient, data)
-	resp, _ := unixSocketCom(*RpcSock, data)
+	resp, _ := unixSocketCom(*RPCSock, data)
 
 	response := struct {
 		ID    int32 `json:"id"`