From 3ff3e0f2acb37388f6a01cca97dbde631052ca38 Mon Sep 17 00:00:00 2001
From: CodeLingo Bot <bot@codelingo.io>
Date: Wed, 22 May 2019 18:48:47 +1200
Subject: [PATCH] Defer closing of files (#17213)

Signed-off-by: CodeLingo Bot <bot@codelingo.io>
---
 pkg/api/dashboard.go                            | 1 +
 pkg/components/imguploader/azureblobuploader.go | 3 ++-
 pkg/components/imguploader/gcsuploader.go       | 1 +
 pkg/components/imguploader/s3uploader.go        | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index ed153c02efe..27f70d4d388 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -316,6 +316,7 @@ func GetHomeDashboard(c *m.ReqContext) Response {
 	if err != nil {
 		return Error(500, "Failed to load home dashboard", err)
 	}
+	defer file.Close()
 
 	dash := dtos.DashboardFullWithMeta{}
 	dash.Meta.IsHome = true
diff --git a/pkg/components/imguploader/azureblobuploader.go b/pkg/components/imguploader/azureblobuploader.go
index bfcb901dd0c..fd39f70678b 100644
--- a/pkg/components/imguploader/azureblobuploader.go
+++ b/pkg/components/imguploader/azureblobuploader.go
@@ -46,10 +46,11 @@ func (az *AzureBlobUploader) Upload(ctx context.Context, imageDiskPath string) (
 	blob := NewStorageClient(az.account_name, az.account_key)
 
 	file, err := os.Open(imageDiskPath)
-
 	if err != nil {
 		return "", err
 	}
+	defer file.Close()
+
 	randomFileName := util.GetRandomString(30) + ".png"
 	// upload image
 	az.log.Debug("Uploading image to azure_blob", "container_name", az.container_name, "blob_name", randomFileName)
diff --git a/pkg/components/imguploader/gcsuploader.go b/pkg/components/imguploader/gcsuploader.go
index 8932e96e59e..443534ff76a 100644
--- a/pkg/components/imguploader/gcsuploader.go
+++ b/pkg/components/imguploader/gcsuploader.go
@@ -67,6 +67,7 @@ func (u *GCSUploader) uploadFile(client *http.Client, imageDiskPath, key string)
 	if err != nil {
 		return err
 	}
+	defer fileReader.Close()
 
 	reqUrl := fmt.Sprintf(uploadUrl, u.bucket, key)
 	u.log.Debug("Request URL: ", reqUrl)
diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go
index d690f629f57..7ad8a0f7beb 100644
--- a/pkg/components/imguploader/s3uploader.go
+++ b/pkg/components/imguploader/s3uploader.go
@@ -69,6 +69,7 @@ func (u *S3Uploader) Upload(ctx context.Context, imageDiskPath string) (string,
 	if err != nil {
 		return "", err
 	}
+	defer file.Close()
 
 	sess, err = session.NewSession(cfg)
 	if err != nil {