From a145ec37bbbf7594d0ddbb832ccc044ae65ece21 Mon Sep 17 00:00:00 2001
From: Jeremy Price <Jeremy.price@grafana.com>
Date: Wed, 24 Nov 2021 11:56:55 +0100
Subject: [PATCH] Handle request service account when not enabled (#42122)

* Handle request service account when not enabled
---
 pkg/api/apikey.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index 4cecbf15359..8e2f92fde35 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -96,6 +96,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
 				return response.Error(403, "Target service is not in the same organisation as requesting user or api key", err)
 			}
 		}
+	} else {
+		if cmd.CreateNewServiceAccount {
+			return response.Error(400, "Service accounts disabled.  Retry create api request without service account flag.", err)
+		}
 	}
 
 	newKeyInfo, err := apikeygen.New(cmd.OrgId, cmd.Name)