Skip to content

refactor: rename deprecated resources #652

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 3 commits into from
Jul 11, 2025
Merged

refactor: rename deprecated resources #652

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
703d101
refactor: rename deprecated resource functions
tembleking Jul 9, 2025
0900c18
refactor: reorder resources and datasources maps
tembleking Jul 9, 2025
c423746
Merge branch 'master' into refactor-rename-deprecated-resources
tembleking Jul 11, 2025
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
6 changes: 3 additions & 3 deletions ...rce_sysdig_secure_notification_channel.go → ...rce_sysdig_secure_notification_channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ const (
notificationChannelSecureEventNotificationContentSection = "SECURE_EVENT_NOTIFICATION_CONTENT"
)

func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
func deprecatedDataSourceSysdigSecureNotificationChannel() *schema.Resource {
timeout := 5 * time.Minute

return &schema.Resource{
ReadContext: dataSourceSysdigNotificationChannelRead,
ReadContext: deprecatedDataSourceSysdigNotificationChannelRead,

Timeouts: &schema.ResourceTimeout{
Read: schema.DefaultTimeout(timeout),
Expand Down Expand Up @@ -118,7 +118,7 @@ func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
}

// Retrieves the information of a resource form the file and loads it in Terraform
func dataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
func deprecatedDataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client, err := getSecureNotificationChannelClient(meta.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand Down
28 changes: 14 additions & 14 deletions .../resource_sysdig_monitor_alert_anomaly.go → ..._resource_sysdig_monitor_alert_anomaly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func resourceSysdigMonitorAlertAnomaly() *schema.Resource {
func deprecatedResourceSysdigMonitorAlertAnomaly() *schema.Resource {
timeout := 5 * time.Minute

return &schema.Resource{
DeprecationMessage: "Anomaly Detection Alerts have been deprecated, \"sysdig_monitor_alert_anomaly\" will be removed in future releases",
CreateContext: resourceSysdigAlertAnomalyCreate,
UpdateContext: resourceSysdigAlertAnomalyUpdate,
ReadContext: resourceSysdigAlertAnomalyRead,
DeleteContext: resourceSysdigAlertAnomalyDelete,
CreateContext: deprecatedResourceSysdigAlertAnomalyCreate,
UpdateContext: deprecatedResourceSysdigAlertAnomalyUpdate,
ReadContext: deprecatedResourceSysdigAlertAnomalyRead,
DeleteContext: deprecatedResourceSysdigAlertAnomalyDelete,
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Expand All @@ -46,13 +46,13 @@ func resourceSysdigMonitorAlertAnomaly() *schema.Resource {
}
}

func resourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := anomalyAlertFromResourceData(data)
alert, err := deprecatedAnomalyAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -67,13 +67,13 @@ func resourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.Resource
return nil
}

func resourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := anomalyAlertFromResourceData(data)
alert, err := deprecatedAnomalyAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -88,7 +88,7 @@ func resourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.Resource
return nil
}

func resourceSysdigAlertAnomalyRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertAnomalyRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -105,15 +105,15 @@ func resourceSysdigAlertAnomalyRead(ctx context.Context, data *schema.ResourceDa
return nil
}

err = anomalyAlertToResourceData(&alert, data)
err = deprecatedAnomalyAlertToResourceData(&alert, data)
if err != nil {
return diag.FromErr(err)
}

return nil
}

func resourceSysdigAlertAnomalyDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertAnomalyDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -132,7 +132,7 @@ func resourceSysdigAlertAnomalyDelete(ctx context.Context, data *schema.Resource
return nil
}

func anomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
func deprecatedAnomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
alert, err = alertFromResourceData(data)
if err != nil {
return
Expand All @@ -157,7 +157,7 @@ func anomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, e
return
}

func anomalyAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
func deprecatedAnomalyAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
err = alertToResourceData(alert, data)
if err != nil {
return
Expand Down
28 changes: 14 additions & 14 deletions ...resource_sysdig_monitor_alert_downtime.go → ...resource_sysdig_monitor_alert_downtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"github.com/spf13/cast"
)

func resourceSysdigMonitorAlertDowntime() *schema.Resource {
func deprecatedResourceSysdigMonitorAlertDowntime() *schema.Resource {
timeout := 5 * time.Minute

return &schema.Resource{
DeprecationMessage: "\"sysdig_monitor_alert_downtime\" has been deprecated and will be removed in future releases, use \"sysdig_monitor_alert_v2_downtime\" instead",
CreateContext: resourceSysdigAlertDowntimeCreate,
UpdateContext: resourceSysdigAlertDowntimeUpdate,
ReadContext: resourceSysdigAlertDowntimeRead,
DeleteContext: resourceSysdigAlertDowntimeDelete,
CreateContext: deprecatedResourceSysdigAlertDowntimeCreate,
UpdateContext: deprecatedResourceSysdigAlertDowntimeUpdate,
ReadContext: deprecatedResourceSysdigAlertDowntimeRead,
DeleteContext: deprecatedResourceSysdigAlertDowntimeDelete,
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Expand All @@ -48,13 +48,13 @@ func resourceSysdigMonitorAlertDowntime() *schema.Resource {
}
}

func resourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := downtimeAlertFromResourceData(data)
alert, err := deprecatedDowntimeAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -70,13 +70,13 @@ func resourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.Resourc
return nil
}

func resourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := downtimeAlertFromResourceData(data)
alert, err := deprecatedDowntimeAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -91,7 +91,7 @@ func resourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.Resourc
return nil
}

func resourceSysdigAlertDowntimeRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertDowntimeRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -108,15 +108,15 @@ func resourceSysdigAlertDowntimeRead(ctx context.Context, data *schema.ResourceD
return nil
}

err = downtimeAlertToResourceData(&alert, data)
err = deprecatedDowntimeAlertToResourceData(&alert, data)
if err != nil {
return diag.FromErr(err)
}

return nil
}

func resourceSysdigAlertDowntimeDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertDowntimeDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -135,7 +135,7 @@ func resourceSysdigAlertDowntimeDelete(ctx context.Context, data *schema.Resourc
return nil
}

func downtimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err error) {
func deprecatedDowntimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err error) {
alert, err = alertFromResourceData(d)
if err != nil {
return
Expand All @@ -152,7 +152,7 @@ func downtimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err
return
}

func downtimeAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
func deprecatedDowntimeAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
err = alertToResourceData(alert, data)
if err != nil {
return
Expand Down
38 changes: 19 additions & 19 deletions ...ig/resource_sysdig_monitor_alert_event.go → ...ed_resource_sysdig_monitor_alert_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func resourceSysdigMonitorAlertEvent() *schema.Resource {
func deprecatedResourceSysdigMonitorAlertEvent() *schema.Resource {
timeout := 5 * time.Minute

return &schema.Resource{
DeprecationMessage: "\"sysdig_monitor_alert_event\" has been deprecated and will be removed in future releases, use \"sysdig_monitor_alert_v2_event\" instead",
CreateContext: resourceSysdigAlertEventCreate,
UpdateContext: resourceSysdigAlertEventUpdate,
ReadContext: resourceSysdigAlertEventRead,
DeleteContext: resourceSysdigAlertEventDelete,
CreateContext: deprecatedResourceSysdigAlertEventCreate,
UpdateContext: deprecatedResourceSysdigAlertEventUpdate,
ReadContext: deprecatedResourceSysdigAlertEventRead,
DeleteContext: deprecatedResourceSysdigAlertEventDelete,
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Expand Down Expand Up @@ -59,13 +59,13 @@ func resourceSysdigMonitorAlertEvent() *schema.Resource {
}
}

func resourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := eventAlertFromResourceData(data)
alert, err := deprecatedEventAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -81,13 +81,13 @@ func resourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceDa
return nil
}

func resourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
}

alert, err := eventAlertFromResourceData(data)
alert, err := deprecatedEventAlertFromResourceData(data)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -102,7 +102,7 @@ func resourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceDa
return nil
}

func resourceSysdigAlertEventRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertEventRead(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -119,15 +119,15 @@ func resourceSysdigAlertEventRead(ctx context.Context, data *schema.ResourceData
return nil
}

err = eventAlertToResourceData(&alert, data)
err = deprecatedEventAlertToResourceData(&alert, data)
if err != nil {
return diag.FromErr(err)
}

return nil
}

func resourceSysdigAlertEventDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
func deprecatedResourceSysdigAlertEventDelete(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
client, err := getMonitorAlertClient(i.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -146,7 +146,7 @@ func resourceSysdigAlertEventDelete(ctx context.Context, data *schema.ResourceDa
return nil
}

func eventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
func deprecatedEventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
alert, err = alertFromResourceData(data)
if err != nil {
return
Expand All @@ -172,19 +172,19 @@ func eventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err
}

// https://regex101.com/r/79VIkC/1
var alertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s*(?P<rel>[^\w\s]+)\s*(?P<count>\d+)`)
var deprecatedAlertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s*(?P<rel>[^\w\s]+)\s*(?P<count>\d+)`)

func eventAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
func deprecatedEventAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
err = alertToResourceData(alert, data)
if err != nil {
return
}

relIndex := alertConditionRegex.SubexpIndex("rel")
countIndex := alertConditionRegex.SubexpIndex("count")
matches := alertConditionRegex.FindStringSubmatch(alert.Condition)
relIndex := deprecatedAlertConditionRegex.SubexpIndex("rel")
countIndex := deprecatedAlertConditionRegex.SubexpIndex("count")
matches := deprecatedAlertConditionRegex.FindStringSubmatch(alert.Condition)
if matches == nil {
return fmt.Errorf("alert condition %s does not match expected expression %s", alert.Condition, alertConditionRegex.String())
return fmt.Errorf("alert condition %s does not match expected expression %s", alert.Condition, deprecatedAlertConditionRegex.String())
}

eventRel := matches[relIndex]
Expand Down
Loading
Loading