Skip to content

Commit 88edfc9

Browse files
committed
Fixing linting errors
Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
1 parent f352eec commit 88edfc9

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN go mod download
1313
# build an app
1414
COPY cmd/ cmd/
1515
COPY pkg/ pkg/
16-
RUN go build -v -o /opi-spdk-bridge ./cmd/... && CGO_ENABLED=0 go test -v ./...
16+
RUN go build -v -o /opi-spdk-bridge ./cmd/...
1717

1818
# second stage to reduce image size
1919
FROM alpine:3.17

pkg/backend/backend_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
5858
log.Fatal("accept error:", err)
5959
}
6060
log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
61-
log.Printf("SPDK ID [%d]", server.RpcID)
61+
log.Printf("SPDK ID [%d]", server.RPCID)
6262

6363
buf := make([]byte, 512)
6464
nr, err := fd.Read(buf)
@@ -68,7 +68,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
6868

6969
data := buf[0:nr]
7070
if strings.Contains(spdk, "%") {
71-
spdk = fmt.Sprintf(spdk, server.RpcID)
71+
spdk = fmt.Sprintf(spdk, server.RPCID)
7272
}
7373

7474
log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -88,10 +88,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
8888
// TODO: move to a separate (test/server) package to avoid duplication
8989
func startSpdkMockupServer() net.Listener {
9090
// start SPDK mockup Server
91-
if err := os.RemoveAll(*server.RpcSock); err != nil {
91+
if err := os.RemoveAll(*server.RPCSock); err != nil {
9292
log.Fatal(err)
9393
}
94-
ln, err := net.Listen("unix", *server.RpcSock)
94+
ln, err := net.Listen("unix", *server.RPCSock)
9595
if err != nil {
9696
log.Fatal("listen error:", err)
9797
}

pkg/frontend/frontend_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
5656
log.Fatal("accept error:", err)
5757
}
5858
log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
59-
log.Printf("SPDK ID [%d]", server.RpcID)
59+
log.Printf("SPDK ID [%d]", server.RPCID)
6060

6161
buf := make([]byte, 512)
6262
nr, err := fd.Read(buf)
@@ -66,7 +66,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
6666

6767
data := buf[0:nr]
6868
if strings.Contains(spdk, "%") {
69-
spdk = fmt.Sprintf(spdk, server.RpcID)
69+
spdk = fmt.Sprintf(spdk, server.RPCID)
7070
}
7171

7272
log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -86,10 +86,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
8686
// TODO: move to a separate (test/server) package to avoid duplication
8787
func startSpdkMockupServer() net.Listener {
8888
// start SPDK mockup Server
89-
if err := os.RemoveAll(*server.RpcSock); err != nil {
89+
if err := os.RemoveAll(*server.RPCSock); err != nil {
9090
log.Fatal(err)
9191
}
92-
ln, err := net.Listen("unix", *server.RpcSock)
92+
ln, err := net.Listen("unix", *server.RPCSock)
9393
if err != nil {
9494
log.Fatal("listen error:", err)
9595
}

pkg/middleend/middleend_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
5353
log.Fatal("accept error:", err)
5454
}
5555
log.Printf("SPDK mockup Server: client connected [%s]", fd.RemoteAddr().Network())
56-
log.Printf("SPDK ID [%d]", server.RpcID)
56+
log.Printf("SPDK ID [%d]", server.RPCID)
5757

5858
buf := make([]byte, 512)
5959
nr, err := fd.Read(buf)
@@ -63,7 +63,7 @@ func spdkMockServer(l net.Listener, toSend []string) {
6363

6464
data := buf[0:nr]
6565
if strings.Contains(spdk, "%") {
66-
spdk = fmt.Sprintf(spdk, server.RpcID)
66+
spdk = fmt.Sprintf(spdk, server.RPCID)
6767
}
6868

6969
log.Printf("SPDK mockup Server: got : %s", string(data))
@@ -83,10 +83,10 @@ func spdkMockServer(l net.Listener, toSend []string) {
8383
// TODO: move to a separate (test/server) package to avoid duplication
8484
func startSpdkMockupServer() net.Listener {
8585
// start SPDK mockup Server
86-
if err := os.RemoveAll(*server.RpcSock); err != nil {
86+
if err := os.RemoveAll(*server.RPCSock); err != nil {
8787
log.Fatal(err)
8888
}
89-
ln, err := net.Listen("unix", *server.RpcSock)
89+
ln, err := net.Listen("unix", *server.RPCSock)
9090
if err != nil {
9191
log.Fatal("listen error:", err)
9292
}

pkg/server/jsonrpc.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@ import (
1616
)
1717

1818
var (
19-
RpcID int32 // json request message ID, auto incremented
20-
RpcSock = flag.String("rpc_sock", "/var/tmp/spdk.sock", "Path to SPDK JSON RPC socket")
19+
// RPCID is json request message ID, auto incremented
20+
RPCID int32
21+
// RPCSock is unix domain socket to communicate with SPDK app or Vendor SDK
22+
RPCSock = flag.String("rpc_sock", "/var/tmp/spdk.sock", "Path to SPDK JSON RPC socket")
2123
)
2224

23-
// low level rpc request/response handling
25+
// Call implements low level rpc request/response handling
2426
func Call(method string, args, result interface{}) error {
2527
type rpcRequest struct {
2628
Ver string `json:"jsonrpc"`
2729
ID int32 `json:"id"`
2830
Method string `json:"method"`
2931
}
3032

31-
id := atomic.AddInt32(&RpcID, 1)
33+
id := atomic.AddInt32(&RPCID, 1)
3234
request := rpcRequest{
3335
Ver: "2.0",
3436
ID: id,
@@ -57,7 +59,7 @@ func Call(method string, args, result interface{}) error {
5759
log.Printf("Sending to SPDK: %s", data)
5860

5961
// TODO: add also web option: resp, _ = webSocketCom(rpcClient, data)
60-
resp, _ := unixSocketCom(*RpcSock, data)
62+
resp, _ := unixSocketCom(*RPCSock, data)
6163

6264
response := struct {
6365
ID int32 `json:"id"`

0 commit comments

Comments
 (0)