Handle request service account when not enabled (#42122) (#42201)

* Handle request service account when not enabled (cherry picked from commit a145ec37bb) Co-authored-by: Jeremy Price <Jeremy.price@grafana.com>
2021-11-25 05:57:30 -05:00
parent 8c4ee0cfdd
commit 085d67f82d
1 changed files with 4 additions and 0 deletions
@@ -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)