resolve conflicts (#50184)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

pkg/services/provisioning/datasources/config_reader_test.go

@@ -240,11 +240,9 @@ func validateDatasource(t *testing.T, dsCfg *configs) {
 	require.Equal(t, ds.OrgID, int64(2))
 	require.Equal(t, ds.URL, "url")
 	require.Equal(t, ds.User, "user")
-	require.Equal(t, ds.Password, "password")
 	require.Equal(t, ds.Database, "database")
 	require.True(t, ds.BasicAuth)
 	require.Equal(t, ds.BasicAuthUser, "basic_auth_user")
-	require.Equal(t, ds.BasicAuthPassword, "basic_auth_password")
 	require.True(t, ds.WithCredentials)
 	require.True(t, ds.IsDefault)
 	require.True(t, ds.Editable)