From 7840e5e6b49c82e3f5afa1a3be0da3e6624939ab Mon Sep 17 00:00:00 2001
From: Jade McGough <jade@thezets.com>
Date: Tue, 22 Jan 2019 19:12:51 -0800
Subject: [PATCH] fix(testing): return organization name in failure messages

---
 inmem/organization_service.go   | 14 ++++++++++++--
 testing/bucket_service.go       |  2 +-
 testing/organization_service.go |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/inmem/organization_service.go b/inmem/organization_service.go
index 70096b00bf..d22c7917e1 100644
--- a/inmem/organization_service.go
+++ b/inmem/organization_service.go
@@ -105,10 +105,15 @@ func (s *Service) FindOrganization(ctx context.Context, filter platform.Organiza
 		}
 	}
 	if n < 1 {
+		msg := errOrganizationNotFound
+		if filter.Name != nil {
+			msg = fmt.Sprintf("organization name \"%s\" not found", *filter.Name)
+		}
+
 		return nil, &platform.Error{
 			Code: platform.ENotFound,
 			Op:   op,
-			Msg:  errOrganizationNotFound,
+			Msg:  msg,
 		}
 	}
 
@@ -146,10 +151,15 @@ func (s *Service) FindOrganizations(ctx context.Context, filter platform.Organiz
 	}
 
 	if len(orgs) == 0 {
+		msg := errOrganizationNotFound
+		if filter.Name != nil {
+			msg = fmt.Sprintf("organization name \"%s\" not found", *filter.Name)
+		}
+
 		return orgs, 0, &platform.Error{
 			Code: platform.ENotFound,
 			Op:   op,
-			Msg:  errOrganizationNotFound,
+			Msg:  msg,
 		}
 	}
 
diff --git a/testing/bucket_service.go b/testing/bucket_service.go
index 482888883d..97c420c31f 100644
--- a/testing/bucket_service.go
+++ b/testing/bucket_service.go
@@ -367,7 +367,7 @@ func CreateBucket(
 				buckets: []*platform.Bucket{},
 				err: &platform.Error{
 					Code: platform.ENotFound,
-					Msg:  "organization not found",
+					Msg:  "organization name \"org1\" not found",
 					Op:   platform.OpCreateBucket,
 				},
 			},
diff --git a/testing/organization_service.go b/testing/organization_service.go
index c132210fde..c389dfd753 100644
--- a/testing/organization_service.go
+++ b/testing/organization_service.go
@@ -465,7 +465,7 @@ func FindOrganizations(
 				err: &platform.Error{
 					Code: platform.ENotFound,
 					Op:   platform.OpFindOrganizations,
-					Msg:  "organization not found",
+					Msg:  "organization name \"na\" not found",
 				},
 			},
 		},
@@ -652,7 +652,7 @@ func FindOrganization(
 				err: &platform.Error{
 					Code: platform.ENotFound,
 					Op:   platform.OpFindOrganization,
-					Msg:  "organization not found",
+					Msg:  "organization name \"abc\" not found",
 				},
 			},
 		},