Skip to content

Commit c277875

Browse files
temblekingtembleking
authored
refactor: rename deprecated resources (#652)
* refactor: rename deprecated resource functions * refactor: reorder resources and datasources maps
1 parent e5f40db commit c277875

9 files changed

+217
-214
lines changed

‎sysdig/data_source_sysdig_secure_notification_channel.go renamed to ‎sysdig/deprecated_data_source_sysdig_secure_notification_channel.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ const (
3434
notificationChannelSecureEventNotificationContentSection = "SECURE_EVENT_NOTIFICATION_CONTENT"
3535
)
3636

37-
func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
37+
func deprecatedDataSourceSysdigSecureNotificationChannel() *schema.Resource {
3838
timeout := 5 * time.Minute
3939

4040
return &schema.Resource{
41-
ReadContext: dataSourceSysdigNotificationChannelRead,
41+
ReadContext: deprecatedDataSourceSysdigNotificationChannelRead,
4242

4343
Timeouts: &schema.ResourceTimeout{
4444
Read: schema.DefaultTimeout(timeout),
@@ -118,7 +118,7 @@ func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
118118
}
119119

120120
// Retrieves the information of a resource form the file and loads it in Terraform
121-
func dataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
121+
func deprecatedDataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
122122
client, err := getSecureNotificationChannelClient(meta.(SysdigClients))
123123
if err != nil {
124124
return diag.FromErr(err)

‎sysdig/resource_sysdig_monitor_alert_anomaly.go renamed to ‎sysdig/deprecated_resource_sysdig_monitor_alert_anomaly.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
1313

14-
func resourceSysdigMonitorAlertAnomaly() *schema.Resource {
14+
func deprecatedResourceSysdigMonitorAlertAnomaly() *schema.Resource {
1515
timeout := 5 * time.Minute
1616

1717
return &schema.Resource{
1818
DeprecationMessage: "Anomaly Detection Alerts have been deprecated, \"sysdig_monitor_alert_anomaly\" will be removed in future releases",
19-
CreateContext: resourceSysdigAlertAnomalyCreate,
20-
UpdateContext: resourceSysdigAlertAnomalyUpdate,
21-
ReadContext: resourceSysdigAlertAnomalyRead,
22-
DeleteContext: resourceSysdigAlertAnomalyDelete,
19+
CreateContext: deprecatedResourceSysdigAlertAnomalyCreate,
20+
UpdateContext: deprecatedResourceSysdigAlertAnomalyUpdate,
21+
ReadContext: deprecatedResourceSysdigAlertAnomalyRead,
22+
DeleteContext: deprecatedResourceSysdigAlertAnomalyDelete,
2323
Importer: &schema.ResourceImporter{
2424
StateContext: schema.ImportStatePassthroughContext,
2525
},
@@ -46,13 +46,13 @@ func resourceSysdigMonitorAlertAnomaly() *schema.Resource {
4646
}
4747
}
4848

49-
func resourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
49+
func deprecatedResourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
5050
client, err := getMonitorAlertClient(i.(SysdigClients))
5151
if err != nil {
5252
return diag.FromErr(err)
5353
}
5454

55-
alert, err := anomalyAlertFromResourceData(data)
55+
alert, err := deprecatedAnomalyAlertFromResourceData(data)
5656
if err != nil {
5757
return diag.FromErr(err)
5858
}
@@ -67,13 +67,13 @@ func resourceSysdigAlertAnomalyCreate(ctx context.Context, data *schema.Resource
6767
return nil
6868
}
6969

70-
func resourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
70+
func deprecatedResourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
7171
client, err := getMonitorAlertClient(i.(SysdigClients))
7272
if err != nil {
7373
return diag.FromErr(err)
7474
}
7575

76-
alert, err := anomalyAlertFromResourceData(data)
76+
alert, err := deprecatedAnomalyAlertFromResourceData(data)
7777
if err != nil {
7878
return diag.FromErr(err)
7979
}
@@ -88,7 +88,7 @@ func resourceSysdigAlertAnomalyUpdate(ctx context.Context, data *schema.Resource
8888
return nil
8989
}
9090

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

108-
err = anomalyAlertToResourceData(&alert, data)
108+
err = deprecatedAnomalyAlertToResourceData(&alert, data)
109109
if err != nil {
110110
return diag.FromErr(err)
111111
}
112112

113113
return nil
114114
}
115115

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

135-
func anomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
135+
func deprecatedAnomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
136136
alert, err = alertFromResourceData(data)
137137
if err != nil {
138138
return
@@ -157,7 +157,7 @@ func anomalyAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, e
157157
return
158158
}
159159

160-
func anomalyAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
160+
func deprecatedAnomalyAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
161161
err = alertToResourceData(alert, data)
162162
if err != nil {
163163
return

‎sysdig/resource_sysdig_monitor_alert_downtime.go renamed to ‎sysdig/deprecated_resource_sysdig_monitor_alert_downtime.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313
"github.com/spf13/cast"
1414
)
1515

16-
func resourceSysdigMonitorAlertDowntime() *schema.Resource {
16+
func deprecatedResourceSysdigMonitorAlertDowntime() *schema.Resource {
1717
timeout := 5 * time.Minute
1818

1919
return &schema.Resource{
2020
DeprecationMessage: "\"sysdig_monitor_alert_downtime\" has been deprecated and will be removed in future releases, use \"sysdig_monitor_alert_v2_downtime\" instead",
21-
CreateContext: resourceSysdigAlertDowntimeCreate,
22-
UpdateContext: resourceSysdigAlertDowntimeUpdate,
23-
ReadContext: resourceSysdigAlertDowntimeRead,
24-
DeleteContext: resourceSysdigAlertDowntimeDelete,
21+
CreateContext: deprecatedResourceSysdigAlertDowntimeCreate,
22+
UpdateContext: deprecatedResourceSysdigAlertDowntimeUpdate,
23+
ReadContext: deprecatedResourceSysdigAlertDowntimeRead,
24+
DeleteContext: deprecatedResourceSysdigAlertDowntimeDelete,
2525
Importer: &schema.ResourceImporter{
2626
StateContext: schema.ImportStatePassthroughContext,
2727
},
@@ -48,13 +48,13 @@ func resourceSysdigMonitorAlertDowntime() *schema.Resource {
4848
}
4949
}
5050

51-
func resourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
51+
func deprecatedResourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
5252
client, err := getMonitorAlertClient(i.(SysdigClients))
5353
if err != nil {
5454
return diag.FromErr(err)
5555
}
5656

57-
alert, err := downtimeAlertFromResourceData(data)
57+
alert, err := deprecatedDowntimeAlertFromResourceData(data)
5858
if err != nil {
5959
return diag.FromErr(err)
6060
}
@@ -70,13 +70,13 @@ func resourceSysdigAlertDowntimeCreate(ctx context.Context, data *schema.Resourc
7070
return nil
7171
}
7272

73-
func resourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
73+
func deprecatedResourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
7474
client, err := getMonitorAlertClient(i.(SysdigClients))
7575
if err != nil {
7676
return diag.FromErr(err)
7777
}
7878

79-
alert, err := downtimeAlertFromResourceData(data)
79+
alert, err := deprecatedDowntimeAlertFromResourceData(data)
8080
if err != nil {
8181
return diag.FromErr(err)
8282
}
@@ -91,7 +91,7 @@ func resourceSysdigAlertDowntimeUpdate(ctx context.Context, data *schema.Resourc
9191
return nil
9292
}
9393

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

111-
err = downtimeAlertToResourceData(&alert, data)
111+
err = deprecatedDowntimeAlertToResourceData(&alert, data)
112112
if err != nil {
113113
return diag.FromErr(err)
114114
}
115115

116116
return nil
117117
}
118118

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

138-
func downtimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err error) {
138+
func deprecatedDowntimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err error) {
139139
alert, err = alertFromResourceData(d)
140140
if err != nil {
141141
return
@@ -152,7 +152,7 @@ func downtimeAlertFromResourceData(d *schema.ResourceData) (alert *v2.Alert, err
152152
return
153153
}
154154

155-
func downtimeAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
155+
func deprecatedDowntimeAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
156156
err = alertToResourceData(alert, data)
157157
if err != nil {
158158
return

‎sysdig/resource_sysdig_monitor_alert_event.go renamed to ‎sysdig/deprecated_resource_sysdig_monitor_alert_event.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1414
)
1515

16-
func resourceSysdigMonitorAlertEvent() *schema.Resource {
16+
func deprecatedResourceSysdigMonitorAlertEvent() *schema.Resource {
1717
timeout := 5 * time.Minute
1818

1919
return &schema.Resource{
2020
DeprecationMessage: "\"sysdig_monitor_alert_event\" has been deprecated and will be removed in future releases, use \"sysdig_monitor_alert_v2_event\" instead",
21-
CreateContext: resourceSysdigAlertEventCreate,
22-
UpdateContext: resourceSysdigAlertEventUpdate,
23-
ReadContext: resourceSysdigAlertEventRead,
24-
DeleteContext: resourceSysdigAlertEventDelete,
21+
CreateContext: deprecatedResourceSysdigAlertEventCreate,
22+
UpdateContext: deprecatedResourceSysdigAlertEventUpdate,
23+
ReadContext: deprecatedResourceSysdigAlertEventRead,
24+
DeleteContext: deprecatedResourceSysdigAlertEventDelete,
2525
Importer: &schema.ResourceImporter{
2626
StateContext: schema.ImportStatePassthroughContext,
2727
},
@@ -59,13 +59,13 @@ func resourceSysdigMonitorAlertEvent() *schema.Resource {
5959
}
6060
}
6161

62-
func resourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
62+
func deprecatedResourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
6363
client, err := getMonitorAlertClient(i.(SysdigClients))
6464
if err != nil {
6565
return diag.FromErr(err)
6666
}
6767

68-
alert, err := eventAlertFromResourceData(data)
68+
alert, err := deprecatedEventAlertFromResourceData(data)
6969
if err != nil {
7070
return diag.FromErr(err)
7171
}
@@ -81,13 +81,13 @@ func resourceSysdigAlertEventCreate(ctx context.Context, data *schema.ResourceDa
8181
return nil
8282
}
8383

84-
func resourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
84+
func deprecatedResourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceData, i any) diag.Diagnostics {
8585
client, err := getMonitorAlertClient(i.(SysdigClients))
8686
if err != nil {
8787
return diag.FromErr(err)
8888
}
8989

90-
alert, err := eventAlertFromResourceData(data)
90+
alert, err := deprecatedEventAlertFromResourceData(data)
9191
if err != nil {
9292
return diag.FromErr(err)
9393
}
@@ -102,7 +102,7 @@ func resourceSysdigAlertEventUpdate(ctx context.Context, data *schema.ResourceDa
102102
return nil
103103
}
104104

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

122-
err = eventAlertToResourceData(&alert, data)
122+
err = deprecatedEventAlertToResourceData(&alert, data)
123123
if err != nil {
124124
return diag.FromErr(err)
125125
}
126126

127127
return nil
128128
}
129129

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

149-
func eventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
149+
func deprecatedEventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err error) {
150150
alert, err = alertFromResourceData(data)
151151
if err != nil {
152152
return
@@ -172,19 +172,19 @@ func eventAlertFromResourceData(data *schema.ResourceData) (alert *v2.Alert, err
172172
}
173173

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

177-
func eventAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
177+
func deprecatedEventAlertToResourceData(alert *v2.Alert, data *schema.ResourceData) (err error) {
178178
err = alertToResourceData(alert, data)
179179
if err != nil {
180180
return
181181
}
182182

183-
relIndex := alertConditionRegex.SubexpIndex("rel")
184-
countIndex := alertConditionRegex.SubexpIndex("count")
185-
matches := alertConditionRegex.FindStringSubmatch(alert.Condition)
183+
relIndex := deprecatedAlertConditionRegex.SubexpIndex("rel")
184+
countIndex := deprecatedAlertConditionRegex.SubexpIndex("count")
185+
matches := deprecatedAlertConditionRegex.FindStringSubmatch(alert.Condition)
186186
if matches == nil {
187-
return fmt.Errorf("alert condition %s does not match expected expression %s", alert.Condition, alertConditionRegex.String())
187+
return fmt.Errorf("alert condition %s does not match expected expression %s", alert.Condition, deprecatedAlertConditionRegex.String())
188188
}
189189

190190
eventRel := matches[relIndex]

0 commit comments

Comments
 (0)