Skip to content
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

Jump to bottom

feat(secure-rule, secure-policy) use status code to determine if resource needs to be recreated #409

Merged
merged 3 commits into from
Sep 8, 2023
Merged

feat(secure-rule, secure-policy) use status code to determine if resource needs to be recreated #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
361b025
use status code to determine if resource needs to be recreated
kmvachhani Sep 8, 2023
f2d9462
refactor response to match other resources
kmvachhani Sep 8, 2023
709621f
set id to "" for policy 404's too
kmvachhani Sep 8, 2023
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
11 changes: 6 additions & 5 deletions sysdig/internal/client/v2/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const (
type RuleInterface interface {
Base
CreateRule(ctx context.Context, rule Rule) (Rule, error)
GetRuleByID(ctx context.Context, ruleID int) (Rule, error)
GetRuleByID(ctx context.Context, ruleID int) (Rule, int, error)
UpdateRule(ctx context.Context, rule Rule) (Rule, error)
DeleteRule(ctx context.Context, ruleID int) error
GetRuleGroup(ctx context.Context, ruleName string, ruleType string) ([]Rule, error)
Expand All @@ -43,18 +43,19 @@ func (client *Client) CreateRule(ctx context.Context, rule Rule) (Rule, error) {
return Unmarshal[Rule](response.Body)
}

func (client *Client) GetRuleByID(ctx context.Context, ruleID int) (Rule, error) {
func (client *Client) GetRuleByID(ctx context.Context, ruleID int) (Rule, int, error) {
response, err := client.requester.Request(ctx, http.MethodGet, client.GetRuleByIDURL(ruleID), nil)
if err != nil {
return Rule{}, err
return Rule{}, 0, err
}
defer response.Body.Close()

if response.StatusCode != http.StatusOK {
return Rule{}, client.ErrorFromResponse(response)
return Rule{}, response.StatusCode, client.ErrorFromResponse(response)
}

return Unmarshal[Rule](response.Body)
rule, err := Unmarshal[Rule](response.Body)
return rule, 0, err
}

func (client *Client) UpdateRule(ctx context.Context, rule Rule) (Rule, error) {
Expand Down
3 changes: 2 additions & 1 deletion sysdig/resource_sysdig_secure_custom_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ func resourceSysdigCustomPolicyRead(ctx context.Context, d *schema.ResourceData,
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down
9 changes: 6 additions & 3 deletions sysdig/resource_sysdig_secure_managed_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ func resourceSysdigManagedPolicyRead(ctx context.Context, d *schema.ResourceData
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand All @@ -134,8 +135,9 @@ func resourceSysdigManagedPolicyDelete(ctx context.Context, d *schema.ResourceDa
// Reset everything back to default values for managed policy
policy, statusCode, err := client.GetPolicyByID(ctx, id)
if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down Expand Up @@ -169,8 +171,9 @@ func resourceSysdigManagedPolicyUpdate(ctx context.Context, d *schema.ResourceDa
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down
6 changes: 4 additions & 2 deletions sysdig/resource_sysdig_secure_managed_ruleset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,9 @@ func resourceSysdigManagedRulesetRead(ctx context.Context, d *schema.ResourceDat
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down Expand Up @@ -187,8 +188,9 @@ func resourceSysdigManagedRulesetUpdate(ctx context.Context, d *schema.ResourceD
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down
3 changes: 2 additions & 1 deletion sysdig/resource_sysdig_secure_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@ func resourceSysdigPolicyRead(ctx context.Context, d *schema.ResourceData, meta
policy, statusCode, err := client.GetPolicyByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sysdig

import (
"context"
"net/http"
"strconv"
"time"

Expand Down Expand Up @@ -79,10 +80,14 @@ func resourceSysdigRuleContainerRead(ctx context.Context, d *schema.ResourceData
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}

if rule.Details.Containers == nil {
Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_falco.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"net/http"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -133,9 +134,13 @@ func resourceSysdigRuleFalcoRead(ctx context.Context, d *schema.ResourceData, me
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)
if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}

if rule.Details.Append != nil && !(*(rule.Details.Append)) {
Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sysdig

import (
"context"
"net/http"
"strconv"
"time"

Expand Down Expand Up @@ -110,9 +111,13 @@ func resourceSysdigRuleFilesystemRead(ctx context.Context, d *schema.ResourceDat
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)
if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}

updateResourceDataForRule(d, rule)
Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sysdig

import (
"context"
"net/http"
"strconv"
"time"

Expand Down Expand Up @@ -118,10 +119,14 @@ func resourceSysdigRuleNetworkRead(ctx context.Context, d *schema.ResourceData,
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}
updateResourceDataForRule(d, rule)

Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sysdig

import (
"context"
"net/http"
"strconv"
"time"

Expand Down Expand Up @@ -79,10 +80,14 @@ func resourceSysdigRuleProcessRead(ctx context.Context, d *schema.ResourceData,
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}

if rule.Details.Processes == nil {
Expand Down
9 changes: 7 additions & 2 deletions sysdig/resource_sysdig_secure_rule_syscall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sysdig

import (
"context"
"net/http"
"strconv"
"time"

Expand Down Expand Up @@ -78,10 +79,14 @@ func resourceSysdigRuleSyscallRead(ctx context.Context, d *schema.ResourceData,
return diag.FromErr(err)
}

rule, err := client.GetRuleByID(ctx, id)
rule, statusCode, err := client.GetRuleByID(ctx, id)

if err != nil {
d.SetId("")
if statusCode == http.StatusNotFound {
d.SetId("")
} else {
return diag.FromErr(err)
}
}

if rule.Details.Syscalls == nil {
Expand Down
Loading