From b6778fd3d7f36eefa59eb9a32ec5e403d6a0b0b7 Mon Sep 17 00:00:00 2001 From: Emily McMullan Date: Fri, 6 Sep 2024 10:42:10 -0400 Subject: [PATCH] update external provider modules Signed-off-by: Emily McMullan --- external-providers/dotnet-external-provider/go.mod | 4 ++-- external-providers/dotnet-external-provider/go.sum | 4 ++-- external-providers/dotnet-external-provider/main.go | 2 +- external-providers/generic-external-provider/go.mod | 4 ++-- external-providers/generic-external-provider/go.sum | 4 ++-- external-providers/generic-external-provider/main.go | 2 +- .../pkg/generic_external_provider/provider.go | 2 +- .../pkg/server_configurations/constants.go | 8 ++++---- .../server_configurations/generic/service_client_test.go | 4 ++-- .../server_configurations/pylsp/service_client_test.go | 4 ++-- .../yaml_language_server/service_client_test.go | 2 +- external-providers/golang-dependency-provider/go.mod | 4 ++-- external-providers/golang-dependency-provider/go.sum | 4 ++-- external-providers/java-external-provider/go.mod | 2 +- external-providers/java-external-provider/main.go | 2 +- external-providers/yq-external-provider/go.mod | 4 ++-- external-providers/yq-external-provider/go.sum | 4 ++-- external-providers/yq-external-provider/main.go | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/external-providers/dotnet-external-provider/go.mod b/external-providers/dotnet-external-provider/go.mod index 247155bf..ee374e3b 100644 --- a/external-providers/dotnet-external-provider/go.mod +++ b/external-providers/dotnet-external-provider/go.mod @@ -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 @@ -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 diff --git a/external-providers/dotnet-external-provider/go.sum b/external-providers/dotnet-external-provider/go.sum index eeb5488f..f6a56166 100644 --- a/external-providers/dotnet-external-provider/go.sum +++ b/external-providers/dotnet-external-provider/go.sum @@ -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= diff --git a/external-providers/dotnet-external-provider/main.go b/external-providers/dotnet-external-provider/main.go index 7e7c4adf..5809d1e7 100644 --- a/external-providers/dotnet-external-provider/main.go +++ b/external-providers/dotnet-external-provider/main.go @@ -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" ) diff --git a/external-providers/generic-external-provider/go.mod b/external-providers/generic-external-provider/go.mod index c7ab8b09..d85bc5c5 100644 --- a/external-providers/generic-external-provider/go.mod +++ b/external-providers/generic-external-provider/go.mod @@ -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 @@ -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 diff --git a/external-providers/generic-external-provider/go.sum b/external-providers/generic-external-provider/go.sum index dc428160..9e44e9a3 100644 --- a/external-providers/generic-external-provider/go.sum +++ b/external-providers/generic-external-provider/go.sum @@ -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= diff --git a/external-providers/generic-external-provider/main.go b/external-providers/generic-external-provider/main.go index 4d86ed82..a1db391e 100644 --- a/external-providers/generic-external-provider/main.go +++ b/external-providers/generic-external-provider/main.go @@ -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" ) diff --git a/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go b/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go index 2354297e..7495dab3 100644 --- a/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go +++ b/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go @@ -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 diff --git a/external-providers/generic-external-provider/pkg/server_configurations/constants.go b/external-providers/generic-external-provider/pkg/server_configurations/constants.go index 3417000e..183def2e 100644 --- a/external-providers/generic-external-provider/pkg/server_configurations/constants.go +++ b/external-providers/generic-external-provider/pkg/server_configurations/constants.go @@ -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 { diff --git a/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go index 72486f5e..4c2bd341 100644 --- a/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go +++ b/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go @@ -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" diff --git a/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go index a62f4722..1f32a21d 100644 --- a/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go +++ b/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go @@ -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" diff --git a/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go index 3ef86084..0bab01a9 100644 --- a/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go +++ b/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go @@ -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" diff --git a/external-providers/golang-dependency-provider/go.mod b/external-providers/golang-dependency-provider/go.mod index 571533e8..c12b2291 100644 --- a/external-providers/golang-dependency-provider/go.mod +++ b/external-providers/golang-dependency-provider/go.mod @@ -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 @@ -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 diff --git a/external-providers/golang-dependency-provider/go.sum b/external-providers/golang-dependency-provider/go.sum index 6e7c00a8..f732057d 100644 --- a/external-providers/golang-dependency-provider/go.sum +++ b/external-providers/golang-dependency-provider/go.sum @@ -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= diff --git a/external-providers/java-external-provider/go.mod b/external-providers/java-external-provider/go.mod index 3e2a902f..36ac34db 100644 --- a/external-providers/java-external-provider/go.mod +++ b/external-providers/java-external-provider/go.mod @@ -1,4 +1,4 @@ -module github.com/konveyor/java-external-provider +module github.com/konveyor/analyzer-lsp/external-providers/java-external-provider go 1.19 diff --git a/external-providers/java-external-provider/main.go b/external-providers/java-external-provider/main.go index bfe82e29..e99af6d6 100644 --- a/external-providers/java-external-provider/main.go +++ b/external-providers/java-external-provider/main.go @@ -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" ) diff --git a/external-providers/yq-external-provider/go.mod b/external-providers/yq-external-provider/go.mod index f0741612..a0e4a903 100644 --- a/external-providers/yq-external-provider/go.mod +++ b/external-providers/yq-external-provider/go.mod @@ -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 @@ -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 diff --git a/external-providers/yq-external-provider/go.sum b/external-providers/yq-external-provider/go.sum index f3ef41d3..e584aeae 100644 --- a/external-providers/yq-external-provider/go.sum +++ b/external-providers/yq-external-provider/go.sum @@ -63,8 +63,8 @@ go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZ go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -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= diff --git a/external-providers/yq-external-provider/main.go b/external-providers/yq-external-provider/main.go index c47c587c..f9b5edb3 100644 --- a/external-providers/yq-external-provider/main.go +++ b/external-providers/yq-external-provider/main.go @@ -7,8 +7,8 @@ import ( "os" "github.com/bombsimon/logrusr/v3" + "github.com/konveyor/analyzer-lsp/external-providers/yq-external-provider/pkg/yq_provider" "github.com/konveyor/analyzer-lsp/provider" - "github.com/konveyor/yq-external-provider/pkg/yq_provider" "github.com/sirupsen/logrus" )