Skip to content

Commit 05905d7

Browse files
authored
drop grpc dial options with storage new client (#1037)
fix ``` storage client: WithHTTPClient is incompatible with gRPC dial options ``` our client options are grpc dial options, which isnt compatible with storage, which uses WithHTTPClient. this worked previously as the options wasnt passed through to the service, but with 1.56.1 in particular, this fix, googleapis/google-cloud-go#12615 Signed-off-by: Kenny Leung <[email protected]>
1 parent 6347c1a commit 05905d7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
cloud.google.com/go/compute/metadata v0.8.0
1010
cloud.google.com/go/profiler v0.4.3
1111
cloud.google.com/go/pubsub/v2 v2.0.0
12-
cloud.google.com/go/storage v1.56.0
12+
cloud.google.com/go/storage v1.56.1
1313
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0
1414
github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270
1515
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ cloud.google.com/go/pubsub/v2 v2.0.0 h1:0qS6mRJ41gD1lNmM/vdm6bR7DQu6coQcVwD+VPf0
3131
cloud.google.com/go/pubsub/v2 v2.0.0/go.mod h1:0aztFxNzVQIRSZ8vUr79uH2bS3jwLebwK6q1sgEub+E=
3232
cloud.google.com/go/storage v1.56.0 h1:iixmq2Fse2tqxMbWhLWC9HfBj1qdxqAmiK8/eqtsLxI=
3333
cloud.google.com/go/storage v1.56.0/go.mod h1:Tpuj6t4NweCLzlNbw9Z9iwxEkrSem20AetIeH/shgVU=
34+
cloud.google.com/go/storage v1.56.1 h1:n6gy+yLnHn0hTwBFzNn8zJ1kqWfR91wzdM8hjRF4wP0=
35+
cloud.google.com/go/storage v1.56.1/go.mod h1:C9xuCZgFl3buo2HZU/1FncgvvOgTAs/rnh4gF4lMg0s=
3436
cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
3537
cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
3638
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=

modules/workqueue/cmd/dispatcher/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"os/signal"
1515
"time"
1616

17-
"chainguard.dev/go-grpc-kit/pkg/options"
1817
"cloud.google.com/go/storage"
1918
"github.com/chainguard-dev/clog"
2019
_ "github.com/chainguard-dev/clog/gcp/init"
@@ -50,7 +49,7 @@ func main() {
5049
var wq workqueue.Interface
5150
switch env.Mode {
5251
case "gcs":
53-
cl, err := storage.NewClient(ctx, options.ClientOptions()...)
52+
cl, err := storage.NewClient(ctx)
5453
if err != nil {
5554
log.Panicf("Failed to create client: %v", err)
5655
}

modules/workqueue/cmd/receiver/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"chainguard.dev/go-grpc-kit/pkg/duplex"
15-
"chainguard.dev/go-grpc-kit/pkg/options"
1615
"cloud.google.com/go/storage"
1716
"github.com/chainguard-dev/clog"
1817
_ "github.com/chainguard-dev/clog/gcp/init"
@@ -53,7 +52,7 @@ func main() {
5352

5453
switch env.Mode {
5554
case "gcs":
56-
cl, err := storage.NewClient(ctx, options.ClientOptions()...)
55+
cl, err := storage.NewClient(ctx)
5756
if err != nil {
5857
log.Panicf("Failed to create client: %v", err)
5958
}

0 commit comments

Comments
 (0)