public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Errors: Make errors the same in dev as prod (#77366)

Browse Source 
When running in dev mode, error messages would contain an additional "error" property alongside "message". Since this causes confusion, that has been removed and now error messages are the same both modes (using "message").
This commit is contained in:
Kyle Brandt
2023-10-30 14:06:26 -04:00
committed by GitHub
parent 40df27a4da
commit e4d1fdc3d0
12 changed files with 16 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/correlations/correlations_create_test.go
-4
View File
@@ -133,7 +133,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Data source not found", response.Message)
require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -161,7 +160,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Data source not found", response.Message)
require.Equal(t, correlations.ErrTargetDataSourceDoesNotExists.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -357,8 +355,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Contains(t, response.Message, "bad request data")
require.Contains(t, response.Error, correlations.ErrInvalidConfigType.Error())
require.Contains(t, response.Error, configType)
require.NoError(t, res.Body.Close())
})
pkg/tests/api/correlations/correlations_delete_test.go
-3
View File
@@ -106,7 +106,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Data source not found", response.Message)
require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -126,7 +125,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Correlation not found", response.Message)
require.Equal(t, correlations.ErrCorrelationNotFound.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -153,7 +151,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Correlation can only be edited via provisioning", response.Message)
require.Equal(t, correlations.ErrCorrelationReadOnly.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
pkg/tests/api/correlations/correlations_update_test.go
-6
View File
@@ -100,7 +100,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Data source not found", response.Message)
require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -123,7 +122,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Correlation not found", response.Message)
require.Equal(t, correlations.ErrCorrelationNotFound.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -153,7 +151,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "Correlation can only be edited via provisioning", response.Message)
require.Equal(t, correlations.ErrCorrelationReadOnly.Error(), response.Error)
require.NoError(t, res.Body.Close())
})
@@ -181,7 +178,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "At least one of label, description or config is required", response.Message)
require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
require.NoError(t, res.Body.Close())
// empty body
@@ -199,7 +195,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "At least one of label, description or config is required", response.Message)
require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
require.NoError(t, res.Body.Close())
// all set to null
@@ -221,7 +216,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "At least one of label, description or config is required", response.Message)
require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
require.NoError(t, res.Body.Close())
})