Skip to content

Commit 6fea8ae

Browse files
authored
feat: update remotedialer (#6478)
1 parent 3042d80 commit 6fea8ae

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ require (
383383
github.com/nwaples/rardecode v1.1.0 // indirect
384384
github.com/opencontainers/go-digest v1.0.0 // indirect
385385
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
386+
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
386387
github.com/paulmach/orb v0.11.1 // indirect
387388
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
388389
github.com/peterbourgon/diskv/v3 v3.0.1 // indirect
@@ -497,7 +498,7 @@ replace (
497498
github.com/pyroscope-io/godeltaprof v0.1.0 => github.com/grafana/pyroscope-go/godeltaprof v0.1.3
498499
github.com/pyroscope-io/pyroscope => github.com/erda-project/pyroscope v0.0.0-20240606092854-2db59554165e
499500
github.com/rancher/apiserver => github.com/rancher/apiserver v0.0.0-20240503193545-2e1b0ddd9791
500-
github.com/rancher/remotedialer => github.com/erda-project/remotedialer v0.2.6-0.20240718060406-84946a1d17b1
501+
github.com/rancher/remotedialer => github.com/erda-project/remotedialer v0.2.6-0.20250107054043-004305a8e459
501502
github.com/rancher/steve => github.com/rancher/steve v0.0.0-20240605141712-7a84620e8bc1
502503
github.com/rancher/wrangler/v2 => github.com/rancher/wrangler/v2 v2.2.0-rc6
503504
github.com/tealeg/xlsx/v3 => github.com/sfwn/xlsx/v3 v3.0.0-20231016172135-b3d7083b7ab3

go.sum

+4-3
Original file line numberDiff line numberDiff line change
@@ -1257,8 +1257,8 @@ github.com/erda-project/influxql v1.1.0-ex h1:NgP5+S5Qo234IVSIJ3N/egvzCNYJURfMAe
12571257
github.com/erda-project/influxql v1.1.0-ex/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk=
12581258
github.com/erda-project/pyroscope v0.0.0-20240606092854-2db59554165e h1:04gD21EY0lcliBZSj3VfKcJO9NbIWKNliXjKLPkMhLE=
12591259
github.com/erda-project/pyroscope v0.0.0-20240606092854-2db59554165e/go.mod h1:oKtFRQJCxy228zqyG5fwPGzo3Fbbj0g+3PVT0C4JJqo=
1260-
github.com/erda-project/remotedialer v0.2.6-0.20240718060406-84946a1d17b1 h1:CLdzGplB9VRtYXFleMrPka71u4xjMw8Ayd+8WTwZjDI=
1261-
github.com/erda-project/remotedialer v0.2.6-0.20240718060406-84946a1d17b1/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
1260+
github.com/erda-project/remotedialer v0.2.6-0.20250107054043-004305a8e459 h1:J8RFvZA8Ywbw+5jR8qH8e05cge3xziFO1vdVMl3hUwM=
1261+
github.com/erda-project/remotedialer v0.2.6-0.20250107054043-004305a8e459/go.mod h1:GZY/PguKGR5i9vKB0VOzzm6hJqB5CHG20kmb/T5quiw=
12621262
github.com/erda-project/rocketmq-operator v0.0.0-20221222075906-f28c42d7bf23 h1:A2cod4X3yK1YIBbTIf7q1b8+/S6iLwyNVtQ/SOYflQo=
12631263
github.com/erda-project/rocketmq-operator v0.0.0-20221222075906-f28c42d7bf23/go.mod h1:NOglgj931lh7myfNFa00hb3UIiRlxhbMjCv/Ek5RJA8=
12641264
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
@@ -2184,6 +2184,8 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
21842184
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
21852185
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
21862186
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
2187+
github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
2188+
github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
21872189
github.com/otiai10/copy v1.5.0 h1:SoXDGnlTUZoqB/wSuj/Y5L6T5i6iN4YRAcMCd+JnLNU=
21882190
github.com/otiai10/copy v1.5.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
21892191
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -2333,7 +2335,6 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
23332335
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
23342336
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
23352337
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
2336-
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
23372338
github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
23382339
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
23392340
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=

internal/tools/cluster-manager/dialer/server/tunnel-server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func clusterRegister(ctx context.Context, server *remotedialer.Server, rw http.R
196196
}
197197
}
198198

199-
server.WithMiddleFuncs(regFunc)
199+
server.WithMiddleFuncs(req, regFunc)
200200
}
201201
default:
202202
clientDataStr := req.Header.Get(apistructs.ClusterManagerHeaderKeyClientDetail.String())

0 commit comments

Comments
 (0)