From e12bbef9dce4c3022d55807a5b7db23711241bbb Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Wed, 15 May 2024 17:12:53 +0200 Subject: [PATCH] remove multierror dep --- go.mod | 5 ----- go.sum | 4 ---- go/nativeMessagingHost.go | 8 +++----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index cc67fcd84d..20181f1c16 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,3 @@ module nativeMessagingHost go 1.21 - -require ( - github.com/hashicorp/errwrap v1.0.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect -) diff --git a/go.sum b/go.sum index 6a62c36673..e69de29bb2 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +0,0 @@ -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= diff --git a/go/nativeMessagingHost.go b/go/nativeMessagingHost.go index 53048d8e22..d0dc2ecd58 100644 --- a/go/nativeMessagingHost.go +++ b/go/nativeMessagingHost.go @@ -25,8 +25,6 @@ import ( "strings" "time" "unsafe" - - "github.com/hashicorp/go-multierror" ) // UTILITY FUNCTIONS @@ -253,7 +251,7 @@ func getOpenPorts() (map[string][]string, error) { totalPids := len(ports) for pid, pidports := range ports { var gatewayPort, grpcWebPort string - var merr multierror.Error + var errs []error for _, port := range pidports { var ( errDetectGateway, errDetectGrpcWeb error @@ -264,14 +262,14 @@ func getOpenPorts() (map[string][]string, error) { } else if v, errDetectGrpcWeb = isGrpcWebServer(port); v { grpcWebPort = port } else { - merr.Errors = append(merr.Errors, fmt.Errorf("pid %s; port: %s: gateway: %v; grpcweb: %v", pid, port, errDetectGateway, errDetectGrpcWeb)) + errs = append(errs, fmt.Errorf("port: %s; gateway: %v; grpcweb: %v", port, errDetectGateway, errDetectGrpcWeb)) } } if gatewayPort != "" && grpcWebPort != "" { ports[pid] = []string{grpcWebPort, gatewayPort} } else { - Trace.Printf("can't detect ports. grpc: '%s'; gateway: '%s'; error: %v;", grpcWebPort, gatewayPort, merr.ErrorOrNil()) + Trace.Printf("can't detect ports. pid: %s; grpc: '%s'; gateway: '%s'; error: %v;", pid, grpcWebPort, gatewayPort, errs) delete(ports, pid) } }