From 2235b7c2d4bfb5d187135362cf1f3f0e708972df Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Mon, 12 Aug 2024 15:48:55 +0200
Subject: all: pkg/gcs supports AppEngine context

---
 pkg/asset/backend_gcs.go | 3 ++-
 pkg/gcs/gcs.go           | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkg')

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
-- 
cgit mrf-deployment