Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Print Maven output on error #697

Closed
wants to merge 8 commits into from
Closed

✨ Print Maven output on error #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7373e78
Print Maven output on error
jmle Sep 4, 2024
9de4bc8
Merge branch 'konveyor:main' into print-mvn-output-on-error
jmle Sep 25, 2024
f26dc1b
:sparkles: Update external provider modules (#699)
eemcmullan Sep 25, 2024
9670dc8
:sparkles: Enable internal java provider (#701)
eemcmullan Sep 26, 2024
4165322
:bug: Check for config proxy settings (#702)
eemcmullan Sep 30, 2024
edbf730
:sparkles: Run from /addon so we can run as non-root user (#703)
jmontleon Oct 10, 2024
67a30fe
:sparkles: Dont send .metadata logs to stdout & update to go 1.21 (#706)
eemcmullan Oct 21, 2024
0cb1375
Try to preserve linebreaks in mvnOutput by casting to a string
jmle Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.21 as builder
WORKDIR /analyzer-lsp

COPY cmd /analyzer-lsp/cmd
Expand Down
2 changes: 1 addition & 1 deletion external-providers/dotnet-external-provider/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TODO: fix version mismatch in final container
FROM golang:1.20 as go-builder
FROM golang:1.21 as go-builder

COPY / /analyzer-lsp

Expand Down
4 changes: 2 additions & 2 deletions external-providers/dotnet-external-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/konveyor/dotnet-external-provider
module github.com/konveyor/analyzer-lsp/external-providers/dotnet-external-provider

go 1.20

Expand Down Expand Up @@ -44,7 +44,7 @@ require (
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/grpc v1.62.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions external-providers/dotnet-external-provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
Expand Down
2 changes: 1 addition & 1 deletion external-providers/dotnet-external-provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

"github.com/bombsimon/logrusr/v3"
"github.com/konveyor/analyzer-lsp/external-providers/dotnet-external-provider/pkg/dotnet"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/dotnet-external-provider/pkg/dotnet"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion external-providers/generic-external-provider/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as go-builder
FROM golang:1.21 as go-builder

COPY / /analyzer-lsp

Expand Down
4 changes: 2 additions & 2 deletions external-providers/generic-external-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/konveyor/generic-external-provider
module github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider

go 1.19

Expand Down Expand Up @@ -28,7 +28,7 @@ require (
go.opentelemetry.io/otel/exporters/jaeger v1.11.2 // indirect
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
Expand Down
4 changes: 2 additions & 2 deletions external-providers/generic-external-provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNX
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
Expand Down
2 changes: 1 addition & 1 deletion external-providers/generic-external-provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

"github.com/bombsimon/logrusr/v3"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/generic-external-provider/pkg/generic_external_provider"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion external-providers/generic-external-provider/pkg/generic_external_provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"

"github.com/go-logr/logr"
serverconf "github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations"
"github.com/konveyor/analyzer-lsp/provider"
serverconf "github.com/konveyor/generic-external-provider/pkg/server_configurations"
)

// TODO(shawn-hurley): Pipe the logger through Determine how and where external
Expand Down
8 changes: 4 additions & 4 deletions external-providers/generic-external-provider/pkg/server_configurations/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"

"github.com/go-logr/logr"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/generic"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/nodejs"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/pylsp"
yaml "github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server"
base "github.com/konveyor/analyzer-lsp/lsp/base_service_client"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/generic-external-provider/pkg/server_configurations/generic"
"github.com/konveyor/generic-external-provider/pkg/server_configurations/nodejs"
"github.com/konveyor/generic-external-provider/pkg/server_configurations/pylsp"
yaml "github.com/konveyor/generic-external-provider/pkg/server_configurations/yaml_language_server"
)

type ServiceClientBuilder interface {
Expand Down
4 changes: 2 additions & 2 deletions ...viders/generic-external-provider/pkg/server_configurations/generic/service_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"github.com/bombsimon/logrusr/v3"
"github.com/go-logr/logr"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/generic"
"github.com/konveyor/analyzer-lsp/lsp/protocol"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/generic-external-provider/pkg/server_configurations/generic"
"gopkg.in/yaml.v2"

"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions ...roviders/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"time"

"github.com/bombsimon/logrusr/v3"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/server_configurations/generic"
"github.com/konveyor/analyzer-lsp/lsp/protocol"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/generic-external-provider/pkg/server_configurations/generic"
"gopkg.in/yaml.v2"

"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion ...c-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/bombsimon/logrusr/v3"
"github.com/konveyor/analyzer-lsp/external-providers/generic-external-provider/pkg/generic_external_provider"
"github.com/konveyor/analyzer-lsp/provider"
"github.com/konveyor/generic-external-provider/pkg/generic_external_provider"
"gopkg.in/yaml.v2"

"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion external-providers/golang-dependency-provider/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as go-builder
FROM golang:1.21 as go-builder

copy / /analyzer-lsp

Expand Down
4 changes: 2 additions & 2 deletions external-providers/golang-dependency-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/konveyor/golang-dependency-provider
module github.com/konveyor/analyzer-lsp/external-providers/golang-dependency-provider

go 1.19

Expand Down Expand Up @@ -27,7 +27,7 @@ require (
go.opentelemetry.io/otel/metric v1.17.0 // indirect
go.opentelemetry.io/otel/sdk v1.17.0 // indirect
go.opentelemetry.io/otel/trace v1.17.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
Expand Down
4 changes: 2 additions & 2 deletions external-providers/golang-dependency-provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0
go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ=
go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
Expand Down
6 changes: 3 additions & 3 deletions external-providers/java-external-provider/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.20 as builder
FROM golang:1.21 as builder

COPY / /analyzer-lsp

Expand All @@ -21,5 +21,5 @@ FROM quay.io/konveyor/jdtls-server-base
COPY --from=builder /java-provider/java-external-provider /usr/local/bin/java-external-provider

EXPOSE 14651

ENTRYPOINT ["java-external-provider", "--port", "14651"]
WORKDIR /addon
ENTRYPOINT ["java-external-provider", "--port", "14651"]
4 changes: 2 additions & 2 deletions external-providers/java-external-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/konveyor/java-external-provider
module github.com/konveyor/analyzer-lsp/external-providers/java-external-provider

go 1.19

require (
github.com/go-logr/logr v1.4.1
github.com/konveyor/analyzer-lsp v0.5.0-rc.1.0.20240729200152-daea76a602fd
github.com/konveyor/analyzer-lsp v0.5.3
github.com/swaggest/openapi-go v0.2.50
go.lsp.dev/uri v0.3.0
go.opentelemetry.io/otel v1.11.2
Expand Down
4 changes: 2 additions & 2 deletions external-providers/java-external-provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
github.com/konveyor/analyzer-lsp v0.5.0-rc.1.0.20240729200152-daea76a602fd h1:mDu+2r8AIDxoIQ8UrGFT3AYygPBZFfQOVL3YfJIPkMw=
github.com/konveyor/analyzer-lsp v0.5.0-rc.1.0.20240729200152-daea76a602fd/go.mod h1:Gqj6MRUA2Jjjw19tUguJB6Bqj4dLwZzb68FmAUok0ac=
github.com/konveyor/analyzer-lsp v0.5.3 h1:RPIcH5s5oQysfKz3o0rnK8pVmwp3MWpIdCheT1gklrw=
github.com/konveyor/analyzer-lsp v0.5.3/go.mod h1:Gqj6MRUA2Jjjw19tUguJB6Bqj4dLwZzb68FmAUok0ac=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
Expand Down
4 changes: 2 additions & 2 deletions external-providers/java-external-provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

"github.com/bombsimon/logrusr/v3"
java "github.com/konveyor/analyzer-lsp/external-providers/java-external-provider/pkg/java_external_provider"
"github.com/konveyor/analyzer-lsp/provider"
java "github.com/konveyor/java-external-provider/pkg/java_external_provider"
"github.com/sirupsen/logrus"
)

Expand All @@ -32,7 +32,7 @@ func main() {
log := logrusr.New(logrusLog)

// must use lspServerName for use of multiple grpc providers
client := java.NewJavaProvider(log, *lspServerName, *contextLines)
client := java.NewJavaProvider(log, *lspServerName, *contextLines, provider.Config{})

if logLevel != nil && *logLevel != 5 {
logrusLog.SetLevel(logrus.Level(*logLevel))
Expand Down
4 changes: 2 additions & 2 deletions external-providers/java-external-provider/pkg/java_external_provider/dependency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func getMavenLocalRepoPath(mvnSettingsFile string) string {
}

// check errors
return string(outb.String())
return outb.String()
}

func (p *javaServiceClient) GetDependenciesFallback(ctx context.Context, location string) (map[uri.URI][]*provider.Dep, error) {
Expand Down Expand Up @@ -310,7 +310,7 @@ func (p *javaServiceClient) getDependenciesForMaven(_ context.Context) (map[uri.
cmd.Dir = moddir
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
return nil, err
return nil, fmt.Errorf("maven dependency:tree command failed with error %w, maven output: %s", err, string(mvnOutput))
}

lines := strings.Split(string(mvnOutput), "\n")
Expand Down
50 changes: 44 additions & 6 deletions external-providers/java-external-provider/pkg/java_external_provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/konveyor/analyzer-lsp/tracing"
"github.com/nxadm/tail"
"github.com/swaggest/openapi-go/openapi3"
"go.lsp.dev/uri"
)

const (
Expand Down Expand Up @@ -64,6 +65,7 @@ var locationToCode = map[string]int{
}

type javaProvider struct {
config provider.Config
Log logr.Logger
contextLines int

Expand All @@ -80,6 +82,8 @@ type javaProvider struct {

var _ provider.BaseClient = &javaProvider{}

var _ provider.InternalProviderClient = &javaProvider{}

var _ provider.DependencyLocationResolver = &javaProvider{}

type javaCondition struct {
Expand All @@ -102,11 +106,12 @@ type element struct {
Value string `yaml:"value" json:"value"` // can be a (java) regex pattern
}

func NewJavaProvider(log logr.Logger, lspServerName string, contextLines int) *javaProvider {
func NewJavaProvider(log logr.Logger, lspServerName string, contextLines int, config provider.Config) *javaProvider {

_, mvnBinaryError := exec.LookPath("mvn")

return &javaProvider{
config: config,
hasMaven: mvnBinaryError == nil,
Log: log,
clients: []provider.ServiceClient{},
Expand Down Expand Up @@ -275,7 +280,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
cancelFunc()
return nil, additionalBuiltinConfig, fmt.Errorf("error downloading java artifact %s - %w", mvnUri, err)
return nil, additionalBuiltinConfig, fmt.Errorf("error downloading java artifact %s - maven output: %s - with error %w", mvnUri, string(mvnOutput), err)
}
downloadedPath := filepath.Join(outputDir,
fmt.Sprintf("%s.jar", strings.Join(mvnCoordinatesParts[1:3], "-")))
Expand Down Expand Up @@ -316,9 +321,11 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
additionalBuiltinConfig.Location = config.Location
additionalBuiltinConfig.DependencyPath = config.DependencyPath

// handle proxy settings
for k, v := range config.Proxy.ToEnvVars() {
os.Setenv(k, v)
if config.Proxy != nil {
// handle proxy settings
for k, v := range config.Proxy.ToEnvVars() {
os.Setenv(k, v)
}
}

args := []string{
Expand Down Expand Up @@ -418,6 +425,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
ReOpen: true,
MustExist: false,
Follow: true,
Logger: tail.DiscardingLogger,
})
if err != nil {
log.Error(err, "unable to set up follower")
Expand Down Expand Up @@ -686,7 +694,7 @@ func resolveSourcesJarsForMaven(ctx context.Context, log logr.Logger, location,
cmd.Dir = location
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
return err
return fmt.Errorf("maven downloadSources command failed with error %w, maven output: %s", err, string(mvnOutput))
}

reader := bytes.NewReader(mvnOutput)
Expand Down Expand Up @@ -846,3 +854,33 @@ func contains(artifacts []javaArtifact, artifactToFind javaArtifact) bool {

return false
}

func (p *javaProvider) Evaluate(ctx context.Context, cap string, conditionInfo []byte) (provider.ProviderEvaluateResponse, error) {
return provider.FullResponseFromServiceClients(ctx, p.clients, cap, conditionInfo)
}

func (p *javaProvider) ProviderInit(ctx context.Context, additionalConfigs []provider.InitConfig) ([]provider.InitConfig, error) {
builtinConfs := []provider.InitConfig{}
if additionalConfigs != nil {
p.config.InitConfig = append(p.config.InitConfig, additionalConfigs...)
}
for _, c := range p.config.InitConfig {
client, builtinConf, err := p.Init(ctx, p.Log, c)
if err != nil {
return nil, err
}
p.clients = append(p.clients, client)
if builtinConf.Location != "" {
builtinConfs = append(builtinConfs, builtinConf)
}
}
return builtinConfs, nil
}

func (p *javaProvider) GetDependencies(ctx context.Context) (map[uri.URI][]*provider.Dep, error) {
return provider.FullDepsResponse(ctx, p.clients)
}

func (p *javaProvider) GetDependenciesDAG(ctx context.Context) (map[uri.URI][]provider.DepDAGItem, error) {
return provider.FullDepDAGResponse(ctx, p.clients)
}
4 changes: 2 additions & 2 deletions external-providers/yq-external-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/konveyor/yq-external-provider
module github.com/konveyor/analyzer-lsp/external-providers/yq-external-provider

go 1.19

Expand Down Expand Up @@ -33,7 +33,7 @@ require (
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
golang.org/x/mod v0.8.0
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.33.1-0.20240408130810-98873a205002 // indirect
Expand Down
Loading
Loading