From d8f966a3dee2308bb8b3610c927639d31985bbae Mon Sep 17 00:00:00 2001
From: Cyrill Troxler <cyrilltroxler@gmail.com>
Date: Sat, 19 Jan 2019 14:39:33 +0100
Subject: [PATCH] Improve bucket error messages

---
 pkg/s3/controllerserver.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/s3/controllerserver.go b/pkg/s3/controllerserver.go
index fe29f9c..b8cf456 100644
--- a/pkg/s3/controllerserver.go
+++ b/pkg/s3/controllerserver.go
@@ -57,13 +57,13 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 
 	exists, err := cs.s3.client.bucketExists(volumeID)
 	if err != nil {
-		return nil, fmt.Errorf("failed to check if bucket exists: %v", err)
+		return nil, fmt.Errorf("failed to check if bucket %s exists: %v", volumeID, err)
 	}
 	if exists {
 		var b *bucket
 		b, err = cs.s3.client.getBucket(volumeID)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get bucket metadata: %v", err)
+			return nil, fmt.Errorf("failed to get bucket metadata of bucket %s: %v", volumeID, err)
 		}
 		// Check if volume capacity requested is bigger than the already existing capacity
 		if capacityBytes > b.CapacityBytes {
@@ -71,10 +71,10 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		}
 	} else {
 		if err = cs.s3.client.createBucket(volumeID); err != nil {
-			return nil, fmt.Errorf("failed to create volume: %v", err)
+			return nil, fmt.Errorf("failed to create volume %s: %v", volumeID, err)
 		}
 		if err = cs.s3.client.createPrefix(volumeID, fsPrefix); err != nil {
-			return nil, fmt.Errorf("failed to create prefix: %v", err)
+			return nil, fmt.Errorf("failed to create prefix %s: %v", fsPrefix, err)
 		}
 	}
 	b := &bucket{