Skip to content

Commit f797fbf

Browse files
committed
Added Logger to closing GCP client
Signed-off-by: pa250194 <[email protected]>
1 parent f62571b commit f797fbf

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

controllers/bucket_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,9 @@ func (r *BucketReconciler) reconcileWithGCP(ctx context.Context, bucket sourcev1
272272
gcpClient, err := r.authGCP(ctx, bucket)
273273
if err != nil {
274274
err = fmt.Errorf("auth error: %w", err)
275-
log.Error(err, "GCP Provider")
276275
return sourcev1.BucketNotReady(bucket, sourcev1.AuthenticationFailedReason, err.Error()), err
277276
}
278-
defer gcpClient.Client.Close()
277+
defer gcpClient.Close(log)
279278

280279
ctxTimeout, cancel := context.WithTimeout(ctx, bucket.Spec.Timeout.Duration)
281280
defer cancel()

pkg/gcp/gcp.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"path/filepath"
2626

2727
gcpstorage "cloud.google.com/go/storage"
28+
"github.com/go-logr/logr"
2829
"google.golang.org/api/iterator"
2930
"google.golang.org/api/option"
3031
)
@@ -162,3 +163,10 @@ func (c *GCPClient) ListObjects(ctx context.Context, bucketName string, query *g
162163
items := c.Client.Bucket(bucketName).Objects(ctx, query)
163164
return items
164165
}
166+
167+
// Close closes the GCP Client and logs any useful errors
168+
func (c *GCPClient) Close(log logr.Logger) {
169+
if err := c.Client.Close(); err != nil {
170+
log.Error(err, "GCP Provider")
171+
}
172+
}

0 commit comments

Comments
 (0)