mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-01 19:12:59 +00:00
Code

fix(firewall): ignore non-existent rules at read/delete (#415)

Browse Source
This commit is contained in:
Pavel Boldyrev 2023-07-08 22:07:07 -04:00 committed by GitHub
parent 01a845636a
commit fc3bbc3d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxmoxtf/resource/firewall/rules.go
View File

@ -10,6 +10,7 @@ import (
"context" "context"
"fmt" "fmt"
"sort" "sort"
"strings"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@ -238,6 +239,11 @@ func RulesRead(ctx context.Context, api firewall.Rule, d *schema.ResourceData) d
readRule := func(pos int, ruleMap map[string]interface{}) error { readRule := func(pos int, ruleMap map[string]interface{}) error {
rule, err := api.GetRule(ctx, pos) rule, err := api.GetRule(ctx, pos)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "no rule at position") {
// this is not an error, the rule does not exist
return nil
}
return fmt.Errorf("error reading rule %d : %w", pos, err) return fmt.Errorf("error reading rule %d : %w", pos, err)
} }
@ -277,7 +283,7 @@ func RulesRead(ctx context.Context, api firewall.Rule, d *schema.ResourceData) d
err = readRule(id.Pos, ruleMap) err = readRule(id.Pos, ruleMap)
if err != nil { if err != nil {
diags = append(diags, diag.FromErr(err)...) diags = append(diags, diag.FromErr(err)...)
} else { } else if len(ruleMap) > 0 {
rules = append(rules, ruleMap) rules = append(rules, ruleMap)
} }
} }
@ -347,7 +353,14 @@ func RulesDelete(ctx context.Context, api firewall.Rule, d *schema.ResourceData)
for _, v := range rules { for _, v := range rules {
rule := v.(map[string]interface{}) rule := v.(map[string]interface{})
pos := rule[mkRulePos].(int) pos := rule[mkRulePos].(int)
err := api.DeleteRule(ctx, pos)
_, err := api.GetRule(ctx, pos)
if err != nil {
// if the rule is not found / can't be retrieved, we can safely ignore it
continue
}
err = api.DeleteRule(ctx, pos)
diags = append(diags, diag.FromErr(err)...) diags = append(diags, diag.FromErr(err)...)
} }