From 0ccc69696bd14d0d228b195fecdfa0f4a4d2d12e Mon Sep 17 00:00:00 2001 From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com> Date: Tue, 5 Oct 2021 11:30:34 +0200 Subject: [PATCH] Break on success when alert already has decision (#997) (#999) * Break on success when alert already has decision (#997) Signed-off-by: Shivam Sandbhor --- .github/workflows/ci_hubtest.yml | 10 +++------- pkg/apiserver/controllers/v1/alerts.go | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_hubtest.yml b/.github/workflows/ci_hubtest.yml index f81457cf2..301565d18 100644 --- a/.github/workflows/ci_hubtest.yml +++ b/.github/workflows/ci_hubtest.yml @@ -12,8 +12,6 @@ jobs: hubtest: name: Hub tests runs-on: ubuntu-latest - env: - PUSH_COVERAGE: ${{ github.ref == 'refs/heads/master' }} steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -54,7 +52,7 @@ jobs: echo "SCENARIO_BADGE_COLOR=$(if [ $SCENARIOS_COV_NUMBER -lt '70' ]; then echo 'red'; else echo 'green'; fi)" >> $GITHUB_ENV - name: Create Parsers badge uses: schneegans/dynamic-badges-action@v1.1.0 - if: ${{ env.PUSH_COVERAGE }} + if: ${{ github.ref == 'refs/heads/master' }} with: auth: ${{ secrets.GIST_BADGES_SECRET }} gistID: ${{ secrets.GIST_BADGES_ID }} @@ -64,13 +62,11 @@ jobs: color: ${{ env.SCENARIO_BADGE_COLOR }} - name: Create Scenarios badge uses: schneegans/dynamic-badges-action@v1.1.0 - if: ${{ env.PUSH_COVERAGE }} + if: ${{ github.ref == 'refs/heads/master' }} with: auth: ${{ secrets.GIST_BADGES_SECRET }} gistID: ${{ secrets.GIST_BADGES_ID }} filename: crowdsec_scenarios_badge.json label: Hub Scenarios message: ${{ env.SCENARIOS_COV }} - color: ${{ env.SCENARIO_BADGE_COLOR }} - - + color: ${{ env.SCENARIO_BADGE_COLOR }} \ No newline at end of file diff --git a/pkg/apiserver/controllers/v1/alerts.go b/pkg/apiserver/controllers/v1/alerts.go index 8e21cb482..65b00fcfd 100644 --- a/pkg/apiserver/controllers/v1/alerts.go +++ b/pkg/apiserver/controllers/v1/alerts.go @@ -138,6 +138,9 @@ func (c *Controller) CreateAlert(gctx *gin.Context) { continue } c.sendAlertToPluginChannel(alert, uint(pIdx)) + if profile.OnSuccess == "break" { + break + } } continue }