Skip to content

Commit aa18e19

Browse files
Forest33Forest33
committed
v0.5.7
1 parent ed90537 commit aa18e19

File tree

7 files changed

+202
-1765
lines changed

7 files changed

+202
-1765
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<img src="https://img.shields.io/github/go-mod/go-version/forest33/warthog?style=flat-square"/>
1010
<a href="https://github.com/grpc-ecosystem/awesome-grpc"><img alt="Awesome gRPC" src="https://raw.githubusercontent.com/sindresorhus/awesome/main/media/badge-flat.svg" /></a>
1111
<br/><br/>
12-
<img src="assets/gui.webp" alt="Warthog UI" title="Warthog cross platform gRPC client"
12+
<img src="assets/gui.webp" alt="Warthog UI" title="Warthog cross platform gRPC client">
1313
</p>
1414

1515

‎adapter/k8s/auth.go

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import (
88
"golang.org/x/oauth2"
99
auth "golang.org/x/oauth2/google"
1010
"google.golang.org/api/container/v1"
11+
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
12+
_ "k8s.io/client-go/plugin/pkg/client/auth/exec"
13+
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
14+
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
1115
"k8s.io/client-go/rest"
1216
"k8s.io/client-go/tools/clientcmd"
1317
"k8s.io/client-go/tools/clientcmd/api"

‎adapter/k8s/client.go

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package k8s
33
import (
44
"bytes"
55
"context"
6+
"errors"
67
"fmt"
78
"net/http"
89
"net/url"
@@ -75,6 +76,7 @@ func (c *Client) PortForward(r *entity.K8SPortForward) (entity.PortForwardContro
7576
if _, err := ctrl.errOut.Write([]byte(err.Error())); err != nil {
7677
c.log.Error().Msgf("failed write to error stream: %v", err)
7778
}
79+
readyCh <- struct{}{}
7880
}
7981

8082
if r.ErrHandler != nil {
@@ -110,11 +112,16 @@ func (c *Client) PortForward(r *entity.K8SPortForward) (entity.PortForwardContro
110112

111113
if err := fw.ForwardPorts(); err != nil {
112114
writeError(err)
115+
return
113116
}
114117
}()
115118

116119
<-readyCh
117120

121+
if ctrl.errOut.Len() != 0 {
122+
return nil, errors.New(ctrl.errOut.String())
123+
}
124+
118125
return ctrl, nil
119126
}
120127

‎bin/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.5
1+
0.5.7

‎deploy/testserver/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
const (
2626
addr = ":33333"
27-
withTLS = true
27+
withTLS = false
2828
)
2929

3030
// Server object capable of interacting with Server

‎go.mod

+51-41
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,87 @@ module github.com/forest33/warthog
33
go 1.21
44

55
require (
6-
github.com/asticode/go-astikit v0.40.0
6+
github.com/asticode/go-astikit v0.42.0
77
github.com/asticode/go-astilectron v0.30.0
88
github.com/asticode/go-astilectron-bootstrap v0.4.14
9-
github.com/golang-jwt/jwt/v5 v5.0.0-rc.1
10-
github.com/golang-migrate/migrate/v4 v4.15.2
11-
github.com/golang/protobuf v1.5.2
12-
github.com/jhump/protoreflect v1.14.0
9+
github.com/golang-jwt/jwt/v5 v5.2.0
10+
github.com/golang-migrate/migrate/v4 v4.16.2
11+
github.com/golang/protobuf v1.5.3
12+
github.com/jhump/protoreflect v1.15.4
1313
github.com/jmoiron/sqlx v1.3.5
1414
github.com/pkg/errors v0.9.1
15-
github.com/rs/zerolog v1.28.0
16-
go.uber.org/multierr v1.8.0
17-
golang.org/x/net v0.7.0
18-
golang.org/x/oauth2 v0.5.0
19-
google.golang.org/api v0.110.0
20-
google.golang.org/grpc v1.53.0
21-
google.golang.org/protobuf v1.31.0
22-
k8s.io/apimachinery v0.26.1
23-
k8s.io/client-go v0.26.1
15+
github.com/rs/zerolog v1.31.0
16+
go.uber.org/multierr v1.11.0
17+
golang.org/x/net v0.19.0
18+
golang.org/x/oauth2 v0.15.0
19+
google.golang.org/api v0.154.0
20+
google.golang.org/grpc v1.60.1
21+
google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1
22+
k8s.io/apimachinery v0.29.0
23+
k8s.io/client-go v0.29.0
2424
)
2525

2626
require (
27-
cloud.google.com/go/compute v1.18.0 // indirect
27+
cloud.google.com/go/compute v1.23.3 // indirect
2828
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2929
github.com/akavel/rsrc v0.10.2 // indirect
3030
github.com/asticode/go-astilectron-bundler v0.7.12 // indirect
3131
github.com/asticode/go-bindata v1.0.0 // indirect
32+
github.com/bufbuild/protocompile v0.7.1 // indirect
3233
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
34-
github.com/go-logr/logr v1.2.3 // indirect
35-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
36-
github.com/go-openapi/jsonreference v0.20.0 // indirect
37-
github.com/go-openapi/swag v0.19.14 // indirect
34+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
35+
github.com/felixge/httpsnoop v1.0.4 // indirect
36+
github.com/go-logr/logr v1.3.0 // indirect
37+
github.com/go-logr/stdr v1.2.2 // indirect
38+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
39+
github.com/go-openapi/jsonreference v0.20.2 // indirect
40+
github.com/go-openapi/swag v0.22.3 // indirect
3841
github.com/gogo/protobuf v1.3.2 // indirect
3942
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
40-
github.com/google/gnostic v0.5.7-v3refs // indirect
41-
github.com/google/go-cmp v0.5.9 // indirect
43+
github.com/google/gnostic-models v0.6.8 // indirect
4244
github.com/google/gofuzz v1.2.0 // indirect
43-
github.com/google/uuid v1.3.0 // indirect
44-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
45-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
45+
github.com/google/s2a-go v0.1.7 // indirect
46+
github.com/google/uuid v1.4.0 // indirect
47+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
48+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
4649
github.com/hashicorp/errwrap v1.1.0 // indirect
4750
github.com/hashicorp/go-multierror v1.1.1 // indirect
4851
github.com/imdario/mergo v0.3.12 // indirect
4952
github.com/josharian/intern v1.0.0 // indirect
5053
github.com/json-iterator/go v1.1.12 // indirect
51-
github.com/mailru/easyjson v0.7.6 // indirect
52-
github.com/mattn/go-colorable v0.1.12 // indirect
53-
github.com/mattn/go-isatty v0.0.14 // indirect
54-
github.com/mattn/go-sqlite3 v1.14.10 // indirect
54+
github.com/mailru/easyjson v0.7.7 // indirect
55+
github.com/mattn/go-colorable v0.1.13 // indirect
56+
github.com/mattn/go-isatty v0.0.19 // indirect
57+
github.com/mattn/go-sqlite3 v1.14.16 // indirect
5558
github.com/moby/spdystream v0.2.0 // indirect
5659
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5760
github.com/modern-go/reflect2 v1.0.2 // indirect
5861
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
62+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5963
github.com/sam-kamerer/go-plister v1.2.0 // indirect
6064
github.com/spf13/pflag v1.0.5 // indirect
6165
go.opencensus.io v0.24.0 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
67+
go.opentelemetry.io/otel v1.21.0 // indirect
68+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
69+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
6270
go.uber.org/atomic v1.7.0 // indirect
63-
golang.org/x/sys v0.5.0 // indirect
64-
golang.org/x/term v0.5.0 // indirect
65-
golang.org/x/text v0.7.0 // indirect
66-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
67-
google.golang.org/appengine v1.6.7 // indirect
68-
google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc // indirect
71+
golang.org/x/crypto v0.16.0 // indirect
72+
golang.org/x/sync v0.5.0 // indirect
73+
golang.org/x/sys v0.15.0 // indirect
74+
golang.org/x/term v0.15.0 // indirect
75+
golang.org/x/text v0.14.0 // indirect
76+
golang.org/x/time v0.5.0 // indirect
77+
google.golang.org/appengine v1.6.8 // indirect
78+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
6979
gopkg.in/inf.v0 v0.9.1 // indirect
7080
gopkg.in/yaml.v2 v2.4.0 // indirect
7181
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/api v0.26.1 // indirect
73-
k8s.io/klog/v2 v2.80.1 // indirect
74-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
75-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
76-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
77-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
82+
k8s.io/api v0.29.0 // indirect
83+
k8s.io/klog/v2 v2.110.1 // indirect
84+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
85+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
86+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
87+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7888
sigs.k8s.io/yaml v1.3.0 // indirect
7989
)

0 commit comments

Comments
 (0)