pkg/apiclient: pick up dropped errors (#676)
This commit is contained in:
parent
f1d23b51f6
commit
7f8faa7565
|
@ -12,6 +12,7 @@ import (
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/models"
|
"github.com/crowdsecurity/crowdsec/pkg/models"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAlertsListAsMachine(t *testing.T) {
|
func TestAlertsListAsMachine(t *testing.T) {
|
||||||
|
@ -388,7 +389,7 @@ func TestAlertsGetAsMachine(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
alerts, resp, err := client.Alerts.GetByID(context.Background(), 1)
|
alerts, resp, err := client.Alerts.GetByID(context.Background(), 1)
|
||||||
|
require.NoError(t, err)
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
}
|
}
|
||||||
|
@ -436,6 +437,7 @@ func TestAlertsCreateAsMachine(t *testing.T) {
|
||||||
defer teardown()
|
defer teardown()
|
||||||
alert := models.AddAlertsRequest{}
|
alert := models.AddAlertsRequest{}
|
||||||
alerts, resp, err := client.Alerts.Add(context.Background(), alert)
|
alerts, resp, err := client.Alerts.Add(context.Background(), alert)
|
||||||
|
require.NoError(t, err)
|
||||||
expected := &models.AddAlertsResponse{"3"}
|
expected := &models.AddAlertsResponse{"3"}
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
@ -480,6 +482,8 @@ func TestAlertsDeleteAsMachine(t *testing.T) {
|
||||||
alert := AlertsDeleteOpts{IPEquals: new(string)}
|
alert := AlertsDeleteOpts{IPEquals: new(string)}
|
||||||
*alert.IPEquals = "1.2.3.4"
|
*alert.IPEquals = "1.2.3.4"
|
||||||
alerts, resp, err := client.Alerts.Delete(context.Background(), alert)
|
alerts, resp, err := client.Alerts.Delete(context.Background(), alert)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
expected := &models.DeleteAlertsResponse{""}
|
expected := &models.DeleteAlertsResponse{""}
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestApiAuth(t *testing.T) {
|
func TestApiAuth(t *testing.T) {
|
||||||
|
@ -46,6 +47,7 @@ func TestApiAuth(t *testing.T) {
|
||||||
alert := DecisionsListOpts{IPEquals: new(string)}
|
alert := DecisionsListOpts{IPEquals: new(string)}
|
||||||
*alert.IPEquals = "1.2.3.4"
|
*alert.IPEquals = "1.2.3.4"
|
||||||
_, resp, err := newcli.Decisions.List(context.Background(), alert)
|
_, resp, err := newcli.Decisions.List(context.Background(), alert)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
@ -76,6 +78,7 @@ func TestApiAuth(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
_, resp, err = newcli.Decisions.List(context.Background(), alert)
|
_, resp, err = newcli.Decisions.List(context.Background(), alert)
|
||||||
|
require.Error(t, err)
|
||||||
|
|
||||||
log.Infof("--> %s", err)
|
log.Infof("--> %s", err)
|
||||||
assert.Contains(t, err.Error(), "APIKey is empty")
|
assert.Contains(t, err.Error(), "APIKey is empty")
|
||||||
|
|
|
@ -12,6 +12,7 @@ import (
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/models"
|
"github.com/crowdsecurity/crowdsec/pkg/models"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDecisionsList(t *testing.T) {
|
func TestDecisionsList(t *testing.T) {
|
||||||
|
@ -86,6 +87,7 @@ func TestDecisionsList(t *testing.T) {
|
||||||
decisionsFilter = DecisionsListOpts{IPEquals: new(string)}
|
decisionsFilter = DecisionsListOpts{IPEquals: new(string)}
|
||||||
*decisionsFilter.IPEquals = "1.2.3.5"
|
*decisionsFilter.IPEquals = "1.2.3.5"
|
||||||
decisions, resp, err = newcli.Decisions.List(context.Background(), decisionsFilter)
|
decisions, resp, err = newcli.Decisions.List(context.Background(), decisionsFilter)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
@ -159,6 +161,7 @@ func TestDecisionsStream(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
decisions, resp, err := newcli.Decisions.GetStream(context.Background(), true)
|
decisions, resp, err := newcli.Decisions.GetStream(context.Background(), true)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
@ -173,6 +176,7 @@ func TestDecisionsStream(t *testing.T) {
|
||||||
|
|
||||||
//and second call, we get empty lists
|
//and second call, we get empty lists
|
||||||
decisions, resp, err = newcli.Decisions.GetStream(context.Background(), false)
|
decisions, resp, err = newcli.Decisions.GetStream(context.Background(), false)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
@ -182,6 +186,7 @@ func TestDecisionsStream(t *testing.T) {
|
||||||
|
|
||||||
//delete stream
|
//delete stream
|
||||||
resp, err = newcli.Decisions.StopStream(context.Background())
|
resp, err = newcli.Decisions.StopStream(context.Background())
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
if resp.Response.StatusCode != http.StatusOK {
|
if resp.Response.StatusCode != http.StatusOK {
|
||||||
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
t.Errorf("Alerts.List returned status: %d, want %d", resp.Response.StatusCode, http.StatusOK)
|
||||||
|
|
Loading…
Reference in a new issue