fix pr

Signed-off-by: Alejandro Brugarolas <abrugaro@redhat.com>
konveyor · Jul 4, 2024 · f8c55e2 · f8c55e2
1 parent 63a54f1
commit f8c55e2
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 26 deletions.
diff --git a/debug/debug.Dockerfile b/debug/debug.Dockerfile
@@ -1,23 +1,30 @@
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 WORKDIR /analyzer-lsp
 
-COPY ../cmd /analyzer-lsp/cmd
-COPY ../engine /analyzer-lsp/engine
-COPY  ../event /analyzer-lsp/event
-COPY ../output /analyzer-lsp/output
-COPY ../jsonrpc2 /analyzer-lsp/jsonrpc2
-COPY  ../jsonrpc2_v2 /analyzer-lsp/jsonrpc2_v2
-COPY ../lsp /analyzer-lsp/lsp
-COPY ../parser /analyzer-lsp/parser
-COPY ../provider /analyzer-lsp/provider
-COPY ../tracing /analyzer-lsp/tracing
-COPY ../external-providers /analyzer-lsp/external-providers
-COPY ../go.mod /analyzer-lsp/go.mod
-COPY ../go.sum /analyzer-lsp/go.sum
-COPY ../Makefile /analyzer-lsp/Makefile
+COPY cmd /analyzer-lsp/cmd
+COPY engine /analyzer-lsp/engine
+COPY event /analyzer-lsp/event
+COPY output /analyzer-lsp/output
+COPY jsonrpc2 /analyzer-lsp/jsonrpc2
+COPY jsonrpc2_v2 /analyzer-lsp/jsonrpc2_v2
+COPY lsp /analyzer-lsp/lsp
+COPY parser /analyzer-lsp/parser
+COPY provider /analyzer-lsp/provider
+COPY tracing /analyzer-lsp/tracing
+COPY external-providers /analyzer-lsp/external-providers
+COPY go.mod /analyzer-lsp/go.mod
+COPY go.sum /analyzer-lsp/go.sum
+COPY Makefile /analyzer-lsp/Makefile
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
+RUN go build -gcflags="all=-N -l" -o konveyor-analyzer ./cmd/analyzer/main.go
+RUN go build -gcflags="all=-N -l" -o konveyor-analyzer-dep ./cmd/dep/main.go
+RUN cd external-providers/generic-external-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go mod tidy && go build -gcflags="all=-N -l" -o generic-external-provider main.go
+RUN cd external-providers/golang-dependency-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go mod tidy && go build -gcflags="all=-N -l" -o golang-dependency-provider main.go
+RUN cd external-providers/java-external-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go mod tidy  && go build -gcflags="all=-N -l" -o java-external-provider main.go
+RUN cd external-providers/yq-external-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go mod tidy  && go build -gcflags="all=-N -l" -o yq-external-provider main.go
+
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest as yq-builder
 RUN microdnf install -y wget tar xz gzip && \
     microdnf clean all
@@ -27,30 +34,37 @@ ARG YQ_BINARY="yq_linux_${TARGETARCH}"
 RUN wget "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY}.tar.gz" -O - | tar xz && \
     mv ${YQ_BINARY} /usr/bin/yq
 
-RUN go build -gcflags="all=-N -l" -o konveyor-analyzer ./cmd/analyzer/main.go
-RUN go build -gcflags="all=-N -l" -o konveyor-analyzer-dep ./cmd/dep/main.go
-RUN cd external-providers/generic-external-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go build -gcflags="all=-N -l" -o generic-external-provider main.go
-RUN cd external-providers/golang-dependency-provider && go mod edit -replace=github.com/konveyor/analyzer-lsp=../../ && go build -gcflags="all=-N -l" -o golang-dependency-provider main.go
-
 FROM jaegertracing/all-in-one:latest AS jaeger-builder
 
 # The unofficial base image w/ jdtls and gopls installed
 FROM quay.io/konveyor/jdtls-server-base
 
-COPY --from=jaeger-builder /go/bin/all-in-one-linux /usr/bin/
+RUN microdnf install gcc-c++ python-devel python3-devel -y
+RUN python3 -m ensurepip --upgrade
+RUN python3 -m pip install 'python-lsp-server>=1.8.2'
+
+ENV NODEJS_VERSION=18
+RUN echo -e "[nodejs]\nname=nodejs\nstream=${NODEJS_VERSION}\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module
+RUN microdnf install nodejs -y
+RUN npm install -g typescript-language-server typescript
 
-COPY --from=builder /analyzer-lsp/konveyor-analyzer /usr/bin/konveyor-analyzer
-COPY --from=builder /analyzer-lsp/konveyor-analyzer-dep /usr/bin/konveyor-analyzer-dep
-COPY --from=builder /analyzer-lsp/external-providers/generic-external-provider/generic-external-provider /usr/bin/generic-external-provider
-COPY --from=builder /analyzer-lsp/external-providers/golang-dependency-provider/golang-dependency-provider /usr/bin/golang-dependency-provider
+COPY --from=jaeger-builder /go/bin/all-in-one-linux /usr/local/bin/all-in-one-linux
+COPY --from=yq-builder /usr/bin/yq /usr/local/bin/yq
+COPY --from=builder /analyzer-lsp/konveyor-analyzer /usr/local/bin/konveyor-analyzer
+COPY --from=builder /analyzer-lsp/konveyor-analyzer-dep /usr/local/bin/konveyor-analyzer-dep
+COPY --from=builder /analyzer-lsp/external-providers/generic-external-provider/generic-external-provider /usr/local/bin/generic-external-provider
+COPY --from=builder /analyzer-lsp/external-providers/yq-external-provider/yq-external-provider /usr/local/bin/yq-external-provider
+COPY --from=builder /analyzer-lsp/external-providers/golang-dependency-provider/golang-dependency-provider /usr/local/bin/golang-dependency-provider
+COPY --from=builder /analyzer-lsp/external-providers/java-external-provider/java-external-provider /usr/local/bin/java-external-provider
 
 COPY --from=builder /go/bin/dlv /
 
 COPY ../provider_container_settings.json /analyzer-lsp/provider_settings.json
 
 WORKDIR /analyzer-lsp
+RUN chgrp -R 0 /analyzer-lsp && chmod -R g=u /analyzer-lsp
 
 EXPOSE 16686 40000
 
 ENTRYPOINT ["/dlv", "--listen=:40000", "--headless=true", "--api-version=2", "--accept-multiclient", "exec"]
-CMD ["/usr/bin/konveyor-analyzer"]
+CMD ["/usr/local/bin/konveyor-analyzer"]
diff --git a/jsonrpc2/jsonrpc2.go b/jsonrpc2/jsonrpc2.go
@@ -145,7 +145,11 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 	}
 	if err != nil {
 		// sending failed, we will never get a response, so don't leave it pending
+		if IsRPCClosed(err) {
+			err = fmt.Errorf("connection to the language server is closed, language server is not running: %w", err)
+		}
 		return err
+
 	}
 	// now wait for the response
 	select {

diff --git a/jsonrpc2_v2/conn.go b/jsonrpc2_v2/conn.go
@@ -292,6 +292,9 @@ func (c *Connection) Notify(ctx context.Context, method string, params interface
 		attempted = true
 	})
 	if err != nil {
+		if IsRPCClosed(err) {
+			err = fmt.Errorf("connection to the language server is closed, language server is not running: %w", err)
+		}
 		return err
 	}
 
@@ -351,6 +354,9 @@ func (c *Connection) Call(ctx context.Context, method string, params interface{}
 
 	event.Metric(ctx, tag.Started.Of(1))
 	if err := c.write(ctx, call); err != nil {
+		if IsRPCClosed(err) {
+			err = fmt.Errorf("connection to the language server is closed, language server is not running: %w", err)
+		}
 		// Sending failed. We will never get a response, so deliver a fake one if it
 		// wasn't already retired by the connection breaking.
 		c.updateInFlight(func(s *inFlightState) {

diff --git a/jsonrpc2_v2/rpcerr.go b/jsonrpc2_v2/rpcerr.go
@@ -0,0 +1,13 @@
+package jsonrpc2
+
+import (
+	"strings"
+)
+
+var errFileClosed = "file already closed"
+var errBrokenPipe = "broken pipe"
+
+func IsRPCClosed(err error) bool {
+	var errMsg = err.Error()
+	return strings.HasSuffix(errMsg, errFileClosed) || strings.HasSuffix(errMsg, errBrokenPipe)
+}