Skip to content

Commit 34b62d2

Browse files
committed
fix(test): reduce IBM parallelism and fix flaky rule count test
- Reduce max-parallel from 20 to 5 for IBM tests to avoid rate limiting - Fix stateful rule count test to check >= 2 instead of exactly 2, avoiding failures when tests run in parallel and create additional rules
1 parent 8c2df5a commit 34b62d2

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
needs: list-ibm-monitor-tests
152152
strategy:
153153
fail-fast: false
154-
max-parallel: 20
154+
max-parallel: 5
155155
matrix:
156156
file: ${{ fromJson(needs.list-ibm-monitor-tests.outputs.matrix) }}
157157
steps:
@@ -202,7 +202,7 @@ jobs:
202202
needs: list-ibm-secure-tests
203203
strategy:
204204
fail-fast: false
205-
max-parallel: 20
205+
max-parallel: 5
206206
matrix:
207207
file: ${{ fromJson(needs.list-ibm-secure-tests.outputs.matrix) }}
208208
steps:

sysdig/data_source_sysdig_secure_rule_stateful_count_test.go

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ package sysdig_test
55
import (
66
"fmt"
77
"os"
8+
"strconv"
89
"strings"
910
"testing"
1011

1112
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1213
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
14+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1315

1416
"github.com/draios/terraform-provider-sysdig/sysdig"
1517
)
@@ -35,13 +37,31 @@ func TestAccRuleStatefulCountDataSource(t *testing.T) {
3537
{
3638
Config: ruleStatefulCountDataSource(),
3739
Check: resource.ComposeTestCheckFunc(
38-
resource.TestCheckResourceAttr("data.sysdig_secure_rule_stateful_count.data_stateful_rule_append", "rule_count", "2"),
40+
testCheckRuleCountAtLeast("data.sysdig_secure_rule_stateful_count.data_stateful_rule_append", 2),
3941
),
4042
},
4143
},
4244
})
4345
}
4446

47+
func testCheckRuleCountAtLeast(resourceName string, minCount int) resource.TestCheckFunc {
48+
return func(s *terraform.State) error {
49+
rs, ok := s.RootModule().Resources[resourceName]
50+
if !ok {
51+
return fmt.Errorf("resource not found: %s", resourceName)
52+
}
53+
countStr := rs.Primary.Attributes["rule_count"]
54+
count, err := strconv.Atoi(countStr)
55+
if err != nil {
56+
return fmt.Errorf("rule_count is not a valid integer: %s", countStr)
57+
}
58+
if count < minCount {
59+
return fmt.Errorf("rule_count expected >= %d, got %d", minCount, count)
60+
}
61+
return nil
62+
}
63+
}
64+
4565
func ruleStatefulCountDataSource() string {
4666
return fmt.Sprintf(`
4767
%s

0 commit comments

Comments
 (0)