Merge branch 'master' into popover-forms

pkg/api/cloudwatch/cloudwatch_test.go

@@ -16,7 +16,8 @@ func TestECSCredProvider(t *testing.T) {
 		defer os.Clearenv()
 		os.Setenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "/abc/123")
 
-		provider := remoteCredProvider(&session.Session{})
+		sess, _ := session.NewSession()
+		provider := remoteCredProvider(sess)
 
 		So(provider, ShouldNotBeNil)
 
@@ -30,7 +31,8 @@ func TestECSCredProvider(t *testing.T) {
 
 func TestDefaultEC2RoleProvider(t *testing.T) {
 	Convey("Running outside an ECS container task", t, func() {
-		provider := remoteCredProvider(&session.Session{})
+		sess, _ := session.NewSession()
+		provider := remoteCredProvider(sess)
 
 		So(provider, ShouldNotBeNil)
 

pkg/api/frontendsettings.go

@@ -102,18 +102,15 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		datasources[ds.Name] = dsMap
 	}
 
-	// add grafana backend data source
-	grafanaDatasourceMeta, _ := plugins.DataSources["grafana"]
-	datasources["-- Grafana --"] = map[string]interface{}{
-		"type": "grafana",
-		"name": "-- Grafana --",
-		"meta": grafanaDatasourceMeta,
-	}
-
-	// add mixed backend data source
-	datasources["-- Mixed --"] = map[string]interface{}{
-		"type": "mixed",
-		"meta": plugins.DataSources["mixed"],
+	// add datasources that are built in (meaning they are not added via data sources page, nor have any entry in datasource table)
+	for _, ds := range plugins.DataSources {
+		if ds.BuiltIn {
+			datasources[ds.Name] = map[string]interface{}{
+				"type": ds.Type,
+				"name": ds.Name,
+				"meta": plugins.DataSources[ds.Id],
+			}
+		}
 	}
 
 	if defaultDatasource == "" {

pkg/api/password.go

@@ -12,7 +12,8 @@ func SendResetPasswordEmail(c *middleware.Context, form dtos.SendResetPasswordEm
 	userQuery := m.GetUserByLoginQuery{LoginOrEmail: form.UserOrEmail}
 
 	if err := bus.Dispatch(&userQuery); err != nil {
-		return ApiError(404, "User does not exist", err)
+		c.Logger.Info("Requested password reset for user that was not found", "user", userQuery.LoginOrEmail)
+		return ApiError(200, "Email sent", err)
 	}
 
 	emailCmd := m.SendResetPasswordEmailCommand{User: userQuery.Result}