Skip to content

fix(vuln-rule-bundle): replace TypeList with TypeSet to ignore ordering #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
+89 −81
Merged

fix(vuln-rule-bundle): replace TypeList with TypeSet to ignore ordering #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sysdig/resource_sysdig_secure_vulnerability_rule_bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func resourceSysdigSecureVulnerabilityRuleBundle() *schema.Resource {
},

"rule": {
Type: schema.TypeList,
Type: schema.TypeSet,
Required: true,
MinItems: 1,
Description: "Rules for this bundle",
Expand Down Expand Up @@ -606,7 +606,7 @@ func vulnerabilityRuleBundleFromResourceData(d *schema.ResourceData) (v2.Vulnera
return &idAsInt
}

rules, err := vulnerabilityRulesFromList(d.Get("rule").([]any))
rules, err := vulnerabilityRulesFromList(d.Get("rule").(*schema.Set).List())
if err != nil {
return v2.VulnerabilityRuleBundle{}, err
}
Expand All @@ -621,7 +621,10 @@ func vulnerabilityRuleBundleFromResourceData(d *schema.ResourceData) (v2.Vulnera
}

func vulnerabilityRulesFromList(list []any) ([]v2.VulnerabilityRule, error) {
var out []v2.VulnerabilityRule
if len(list) == 0 {
return nil, fmt.Errorf("empty rule detected, you need to specify one")
}
out := []v2.VulnerabilityRule{}

for _, ruleRaw := range list {
if ruleRaw == nil {
Expand Down
161 changes: 83 additions & 78 deletions sysdig/resource_sysdig_secure_vulnerability_rule_bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,22 @@ func TestAccVulnerabilityRuleBundle(t *testing.T) {
),
},
{
Config: fullVulnerabilityRuleBundleConfig_ImageLabel(random()),
Config: singleRuleConfig_label_must_not_exist(random()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.image_label.0.label_must_not_exist", "forbidden-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.1.image_label.0.label_must_exist", "another-required-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.2.image_label.0.label_must_exist_and_contain_value.0.required_label", "required-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.2.image_label.0.label_must_exist_and_contain_value.0.required_value", "required-value"),
),
},
{
Config: singleRuleConfig_label_must_exist(random()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.image_label.0.label_must_exist", "another-required-label"),
),
},
{
Config: singleRuleConfig_label_must_exist_and_contain_value(random()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.image_label.0.label_must_exist_and_contain_value.0.required_label", "required-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.image_label.0.label_must_exist_and_contain_value.0.required_value", "required-value"),
),
},
{
Expand All @@ -103,29 +113,6 @@ func TestAccVulnerabilityRuleBundle(t *testing.T) {
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.severities_and_threats.0.epss_percentile_at_least_percentage", "90"),
),
},
{
Config: fullVulnerabilityRuleBundleConfig_AllTypes(random()),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.image_label.0.label_must_not_exist", "forbidden-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.1.image_label.0.label_must_exist", "another-required-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.2.image_label.0.label_must_exist_and_contain_value.0.required_label", "required-label"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.2.image_label.0.label_must_exist_and_contain_value.0.required_value", "required-value"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.severity_at_least", "high"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.disclosure_older_than_days", "90"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.package_type", "os"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.in_use", "true"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.fix_available_since_days", "30"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.public_exploit_available_since_days", "15"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.exploit_no_admin_privileges", "true"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.exploit_no_user_interaction", "true"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.exploit_network_attack_vector", "true"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.cisa_kev_in_ransomware_campaign", "true"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.cisa_kev_available_since_days", "10"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.cisa_kev_due_date_in_days", "21"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.epss_score_at_least_percentage", "80"),
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.3.severities_and_threats.0.epss_percentile_at_least_percentage", "90"),
),
},
{
Config: variantVulnerabilityRuleBundleConfig_SeverityEquals(random()),
Check: resource.ComposeTestCheckFunc(
Expand Down Expand Up @@ -157,6 +144,9 @@ func TestAccVulnerabilityRuleBundle(t *testing.T) {
resource.TestCheckResourceAttr("sysdig_secure_vulnerability_rule_bundle.sample", "rule.0.severities_and_threats.0.fix_available", "true"),
),
},
{
Config: fullVulnerabilityRuleBundleConfig_AllTypes(random()),
},
{
ResourceName: "sysdig_secure_vulnerability_rule_bundle.sample",
ImportState: true,
Expand Down Expand Up @@ -224,82 +214,39 @@ resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
`, suffix)
}

func fullVulnerabilityRuleBundleConfig_ImageLabel(suffix string) string {
func singleRuleConfig_label_must_not_exist(suffix string) string {
return fmt.Sprintf(`
resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
name = "TERRAFORM TEST %s"
description = "Full bundle with image_label rules"

description = "rule with label_must_not_exist"
rule {
image_label {
label_must_not_exist = "forbidden-label"
}
}

rule {
image_label {
label_must_exist = "another-required-label"
}
}

rule {
image_label {
label_must_exist_and_contain_value {
required_label = "required-label"
required_value = "required-value"
}
}
}
}
`, suffix)
}

func fullVulnerabilityRuleBundleConfig_Severities(suffix string) string {
func singleRuleConfig_label_must_exist(suffix string) string {
return fmt.Sprintf(`
resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
name = "TERRAFORM TEST %s"
description = "Full bundle with severities_and_threats rules"

description = "rule with label_must_exist"
rule {
severities_and_threats {
severity_at_least = "high"
disclosure_older_than_days = 90
package_type = "os"
in_use = true
fix_available_since_days = 30
public_exploit_available_since_days = 15
exploit_no_admin_privileges = true
exploit_no_user_interaction = true
exploit_network_attack_vector = true
cisa_kev_in_ransomware_campaign = true
cisa_kev_available_since_days = 10
cisa_kev_due_date_in_days = 21
epss_score_at_least_percentage = 80
epss_percentile_at_least_percentage = 90
image_label {
label_must_exist = "another-required-label"
}
}
}
`, suffix)
}

func fullVulnerabilityRuleBundleConfig_AllTypes(suffix string) string {
func singleRuleConfig_label_must_exist_and_contain_value(suffix string) string {
return fmt.Sprintf(`
resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
name = "TERRAFORM TEST %s"
description = "Full bundle with all rule types"

rule {
image_label {
label_must_not_exist = "forbidden-label"
}
}

rule {
image_label {
label_must_exist = "another-required-label"
}
}

description = "rule with label_must_exist_and_contain_value"
rule {
image_label {
label_must_exist_and_contain_value {
Expand All @@ -308,6 +255,15 @@ resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
}
}
}
}
`, suffix)
}

func fullVulnerabilityRuleBundleConfig_Severities(suffix string) string {
return fmt.Sprintf(`
resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
name = "TERRAFORM TEST %s"
description = "Full bundle with severities_and_threats rules"

rule {
severities_and_threats {
Expand Down Expand Up @@ -485,3 +441,52 @@ resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
}
`, suffix)
}

func fullVulnerabilityRuleBundleConfig_AllTypes(suffix string) string {
return fmt.Sprintf(`
resource "sysdig_secure_vulnerability_rule_bundle" "sample" {
name = "TERRAFORM TEST %s"
description = "Full bundle with all rule types"

rule {
image_label {
label_must_not_exist = "forbidden-label"
}
}

rule {
image_label {
label_must_exist = "another-required-label"
}
}

rule {
image_label {
label_must_exist_and_contain_value {
required_label = "required-label"
required_value = "required-value"
}
}
}

rule {
severities_and_threats {
severity_at_least = "high"
disclosure_older_than_days = 90
package_type = "os"
in_use = true
fix_available_since_days = 30
public_exploit_available_since_days = 15
exploit_no_admin_privileges = true
exploit_no_user_interaction = true
exploit_network_attack_vector = true
cisa_kev_in_ransomware_campaign = true
cisa_kev_available_since_days = 10
cisa_kev_due_date_in_days = 21
epss_score_at_least_percentage = 80
epss_percentile_at_least_percentage = 90
}
}
}
`, suffix)
}
Loading