From 66ba19b7ba3d9a3e27dd76b9a46be41c56e0009d Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@raintank.io>
Date: Tue, 7 Jul 2015 12:51:38 -0700
Subject: [PATCH] clearer errors

"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
---
 pkg/api/dashboard_snapshot.go               | 2 +-
 pkg/models/dashboards.go                    | 1 +
 pkg/models/models.go                        | 4 ----
 pkg/services/sqlstore/dashboard_snapshot.go | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 0061a2eba19..be044cc25eb 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -59,7 +59,7 @@ func GetDashboardSnapshot(c *middleware.Context) {
 
 	// expired snapshots should also be removed from db
 	if snapshot.Expires.Before(time.Now()) {
-		c.JsonApiErr(404, "Snapshot not found", err)
+		c.JsonApiErr(404, "Dashboard snapshot not found", err)
 		return
 	}
 
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index cdcc4d52364..7d4a2690556 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -11,6 +11,7 @@ import (
 // Typed errors
 var (
 	ErrDashboardNotFound           = errors.New("Dashboard not found")
+	ErrDashboardSnapshotNotFound   = errors.New("Dashboard snapshot not found")
 	ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists")
 	ErrDashboardVersionMismatch    = errors.New("The dashboard has been changed by someone else")
 )
diff --git a/pkg/models/models.go b/pkg/models/models.go
index c38f0c5a391..189e594576b 100644
--- a/pkg/models/models.go
+++ b/pkg/models/models.go
@@ -1,7 +1,5 @@
 package models
 
-import "errors"
-
 type OAuthType int
 
 const (
@@ -9,5 +7,3 @@ const (
 	GOOGLE
 	TWITTER
 )
-
-var ErrNotFound = errors.New("Not found")
diff --git a/pkg/services/sqlstore/dashboard_snapshot.go b/pkg/services/sqlstore/dashboard_snapshot.go
index 0bbb01ed6bd..f4611050a77 100644
--- a/pkg/services/sqlstore/dashboard_snapshot.go
+++ b/pkg/services/sqlstore/dashboard_snapshot.go
@@ -57,7 +57,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
 	if err != nil {
 		return err
 	} else if has == false {
-		return m.ErrNotFound
+		return m.ErrDashboardSnapshotNotFound
 	}
 
 	query.Result = &snapshot