diff options
| author | Taras Madan <tarasmadan@google.com> | 2024-08-12 15:48:55 +0200 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2024-08-12 15:10:06 +0000 |
| commit | 2235b7c2d4bfb5d187135362cf1f3f0e708972df (patch) | |
| tree | df2478382a5a6fc75e6050d3885bb21736b9e48e | |
| parent | 6ba02fb7c5dd2e8985ade7303b33c940d4d1d6a9 (diff) | |
all: pkg/gcs supports AppEngine context
| -rw-r--r-- | pkg/asset/backend_gcs.go | 3 | ||||
| -rw-r--r-- | pkg/gcs/gcs.go | 3 | ||||
| -rw-r--r-- | syz-ci/manager.go | 3 | ||||
| -rw-r--r-- | vm/gce/gce.go | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pkg/asset/backend_gcs.go b/pkg/asset/backend_gcs.go index a196d89b9..7791fe777 100644 --- a/pkg/asset/backend_gcs.go +++ b/pkg/asset/backend_gcs.go @@ -4,6 +4,7 @@ package asset import ( + "context" "fmt" "io" "net/url" @@ -22,7 +23,7 @@ type cloudStorageBackend struct { func makeCloudStorageBackend(bucket string, tracer debugtracer.DebugTracer) (*cloudStorageBackend, error) { tracer.Log("created gcs backend for bucket '%s'", bucket) - client, err := gcs.NewClient() + client, err := gcs.NewClient(context.Background()) if err != nil { return nil, fmt.Errorf("the call to NewClient failed: %w", err) } diff --git a/pkg/gcs/gcs.go b/pkg/gcs/gcs.go index e46350d2c..756d2c65d 100644 --- a/pkg/gcs/gcs.go +++ b/pkg/gcs/gcs.go @@ -38,8 +38,7 @@ func (file *File) Reader() (io.ReadCloser, error) { return file.handle.NewReader(file.ctx) } -func NewClient() (*Client, error) { - ctx := context.Background() +func NewClient(ctx context.Context) (*Client, error) { storageClient, err := storage.NewClient(ctx) if err != nil { return nil, err diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 14ecaa9b5..218f7ecc4 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -4,6 +4,7 @@ package main import ( + "context" "crypto/sha256" "encoding/json" "errors" @@ -969,7 +970,7 @@ func (mgr *Manager) uploadFile(dstPath, name string, file io.Reader, allowPublis func uploadFileGCS(URL string, file io.Reader, publish bool) error { URL = strings.TrimPrefix(URL, "gs://") - GCS, err := gcs.NewClient() + GCS, err := gcs.NewClient(context.Background()) if err != nil { return fmt.Errorf("failed to create GCS client: %w", err) } diff --git a/vm/gce/gce.go b/vm/gce/gce.go index 19fd1eecd..dbed89bee 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -15,6 +15,7 @@ import ( "archive/tar" "bytes" "compress/gzip" + "context" "errors" "fmt" "io" @@ -491,7 +492,7 @@ func (inst *instance) getSerialPortOutput() ([]byte, error) { } func uploadImageToGCS(localImage, gcsImage string) error { - GCS, err := gcs.NewClient() + GCS, err := gcs.NewClient(context.Background()) if err != nil { return fmt.Errorf("failed to create GCS client: %w", err) } |