From 42d465e38ae6868a522b66e08a12a0fac4cf4b9a Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:22:37 +0100 Subject: [PATCH] API: Datasource endpoint should return 400 bad request if id and orgId is invalid (#32392) (#32397) * return 400 bad request if id and orgId is invalid Signed-off-by: bergquist Co-authored-by: Arve Knudsen (cherry picked from commit eb241b960f5f652a23c66ddce5027dcc2b27e673) Co-authored-by: Carl Bergquist --- pkg/api/datasources.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index 3d96f3b7948..621e8c29943 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -72,6 +72,9 @@ func GetDataSourceById(c *models.ReqContext) response.Response { if errors.Is(err, models.ErrDataSourceNotFound) { return response.Error(404, "Data source not found", nil) } + if errors.Is(err, models.ErrDataSourceIdentifierNotSet) { + return response.Error(400, "Datasource id is missing", nil) + } return response.Error(500, "Failed to query datasources", err) }