Skip to content

Commit 8913363

Browse files
MatzocMatzoc
committed
renaming resource
1 parent f121dc2 commit 8913363

12 files changed

+60
-77
lines changed

‎datadog/fwprovider/resource_datadog_csm_resource_evaluation_filter.go renamed to ‎datadog/fwprovider/resource_datadog_compliance_resource_evaluation_filter.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils"
2222
)
2323

24-
type CsmResourceEvaluationFilter struct {
24+
type ComplianceResourceEvaluationFilter struct {
2525
API *datadogV2.SecurityMonitoringApi
2626
Auth context.Context
2727
}
@@ -33,22 +33,22 @@ type ResourceEvaluationFilterModel struct {
3333
}
3434

3535
func NewResourceEvaluationFilter() resource.Resource {
36-
return &CsmResourceEvaluationFilter{}
36+
return &ComplianceResourceEvaluationFilter{}
3737
}
3838

3939
var (
40-
_ resource.ResourceWithConfigure = &CsmResourceEvaluationFilter{}
41-
_ resource.ResourceWithImportState = &CsmResourceEvaluationFilter{}
40+
_ resource.ResourceWithConfigure = &ComplianceResourceEvaluationFilter{}
41+
_ resource.ResourceWithImportState = &ComplianceResourceEvaluationFilter{}
4242
)
4343

44-
func (r *CsmResourceEvaluationFilter) Configure(_ context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
44+
func (r *ComplianceResourceEvaluationFilter) Configure(_ context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
4545
providerData, _ := request.ProviderData.(*FrameworkProvider)
4646
r.API = providerData.DatadogApiInstances.GetSecurityMonitoringApiV2()
4747
r.Auth = providerData.Auth
4848
}
4949

50-
func (r *CsmResourceEvaluationFilter) Metadata(_ context.Context, _ resource.MetadataRequest, resp *resource.MetadataResponse) {
51-
resp.TypeName = "resource_evaluation_filter"
50+
func (r *ComplianceResourceEvaluationFilter) Metadata(_ context.Context, _ resource.MetadataRequest, resp *resource.MetadataResponse) {
51+
resp.TypeName = "compliance_resource_evaluation_filter"
5252
}
5353

5454
var tagFormatValidator = stringvalidator.RegexMatches(
@@ -76,7 +76,7 @@ func toSliceString(list types.List) ([]string, diag.Diagnostics) {
7676
return result, diags
7777
}
7878

79-
func (r *CsmResourceEvaluationFilter) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
79+
func (r *ComplianceResourceEvaluationFilter) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
8080
resp.Schema = schema.Schema{
8181
Description: "Manage a single resource evaluation filter.",
8282
Attributes: map[string]schema.Attribute{
@@ -100,7 +100,7 @@ func (r *CsmResourceEvaluationFilter) Schema(_ context.Context, _ resource.Schem
100100
}
101101
}
102102

103-
func (r *CsmResourceEvaluationFilter) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) {
103+
func (r *ComplianceResourceEvaluationFilter) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) {
104104
var state ResourceEvaluationFilterModel
105105
response.Diagnostics.Append(request.Plan.Get(ctx, &state)...)
106106
if response.Diagnostics.HasError() {
@@ -136,7 +136,7 @@ func convertStringSliceToAttrValues(s []string) []attr.Value {
136136
return out
137137
}
138138

139-
func (r *CsmResourceEvaluationFilter) UpdateState(_ context.Context, state *ResourceEvaluationFilterModel, attributes *datadogV2.ResourceFilterAttributes) {
139+
func (r *ComplianceResourceEvaluationFilter) UpdateState(_ context.Context, state *ResourceEvaluationFilterModel, attributes *datadogV2.ResourceFilterAttributes) {
140140
for p, accounts := range attributes.CloudProvider {
141141
for id, tagList := range accounts {
142142
tags := types.ListValueMust(types.StringType, convertStringSliceToAttrValues(tagList))
@@ -149,7 +149,7 @@ func (r *CsmResourceEvaluationFilter) UpdateState(_ context.Context, state *Reso
149149
}
150150
}
151151

152-
func (r *CsmResourceEvaluationFilter) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
152+
func (r *ComplianceResourceEvaluationFilter) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
153153
var state ResourceEvaluationFilterModel
154154
response.Diagnostics.Append(request.State.Get(ctx, &state)...)
155155
if response.Diagnostics.HasError() {
@@ -171,7 +171,7 @@ func (r *CsmResourceEvaluationFilter) Read(ctx context.Context, request resource
171171
}
172172
resp, _, err := r.API.GetResourceEvaluationFilters(r.Auth, params)
173173
if err != nil {
174-
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving CsmResourceEvaluationFilter"))
174+
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving ComplianceResourceEvaluationFilter"))
175175
return
176176
}
177177

@@ -180,7 +180,7 @@ func (r *CsmResourceEvaluationFilter) Read(ctx context.Context, request resource
180180
response.Diagnostics.Append(response.State.Set(ctx, &state)...)
181181
}
182182

183-
func (r *CsmResourceEvaluationFilter) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
183+
func (r *ComplianceResourceEvaluationFilter) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
184184
var state ResourceEvaluationFilterModel
185185
response.Diagnostics.Append(request.Plan.Get(ctx, &state)...)
186186
if response.Diagnostics.HasError() {
@@ -196,7 +196,7 @@ func (r *CsmResourceEvaluationFilter) Update(ctx context.Context, request resour
196196

197197
resp, _, err := r.API.UpdateResourceEvaluationFilters(r.Auth, *body)
198198
if err != nil {
199-
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error updating CsmResourceEvaluationFilter"))
199+
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error updating ComplianceResourceEvaluationFilter"))
200200
return
201201
}
202202
if err := utils.CheckForUnparsed(resp); err != nil {
@@ -209,7 +209,7 @@ func (r *CsmResourceEvaluationFilter) Update(ctx context.Context, request resour
209209
response.Diagnostics.Append(response.State.Set(ctx, &state)...)
210210
}
211211

212-
func (r *CsmResourceEvaluationFilter) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) {
212+
func (r *ComplianceResourceEvaluationFilter) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) {
213213
var state ResourceEvaluationFilterModel
214214
response.Diagnostics.Append(request.State.Get(ctx, &state)...)
215215
if response.Diagnostics.HasError() {
@@ -225,7 +225,7 @@ func (r *CsmResourceEvaluationFilter) Delete(ctx context.Context, request resour
225225

226226
resp, _, err := r.API.UpdateResourceEvaluationFilters(r.Auth, *body)
227227
if err != nil {
228-
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error deleting CsmResourceEvaluationFilter"))
228+
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error deleting ComplianceResourceEvaluationFilter"))
229229
return
230230
}
231231
if err := utils.CheckForUnparsed(resp); err != nil {
@@ -234,7 +234,7 @@ func (r *CsmResourceEvaluationFilter) Delete(ctx context.Context, request resour
234234
}
235235
}
236236

237-
func (r *CsmResourceEvaluationFilter) ImportState(
237+
func (r *ComplianceResourceEvaluationFilter) ImportState(
238238
ctx context.Context,
239239
req resource.ImportStateRequest,
240240
resp *resource.ImportStateResponse,
@@ -255,7 +255,7 @@ func (r *CsmResourceEvaluationFilter) ImportState(
255255
resp.State.SetAttribute(ctx, path.Root("id"), id)
256256
}
257257

258-
func (r *CsmResourceEvaluationFilter) buildUpdateResourceEvaluationFilterRequest(ctx context.Context, state *ResourceEvaluationFilterModel) (*datadogV2.UpdateResourceEvaluationFiltersRequest, diag.Diagnostics) {
258+
func (r *ComplianceResourceEvaluationFilter) buildUpdateResourceEvaluationFilterRequest(ctx context.Context, state *ResourceEvaluationFilterModel) (*datadogV2.UpdateResourceEvaluationFiltersRequest, diag.Diagnostics) {
259259
diags := diag.Diagnostics{}
260260
data := datadogV2.NewUpdateResourceEvaluationFiltersRequestDataWithDefaults()
261261

‎datadog/tests/cassettes/TestAccResourceEvaluationFilter.freeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025-05-22T09:33:15.988267+01:00
1+
2025-05-22T15:29:52.616608+01:00

‎datadog/tests/cassettes/TestAccResourceEvaluationFilter.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ interactions:
3636
- application/vnd.api+json
3737
status: 201 Created
3838
code: 201
39-
duration: 572.485416ms
39+
duration: 513.520667ms
4040
- id: 1
4141
request:
4242
proto: HTTP/1.1
@@ -63,13 +63,13 @@ interactions:
6363
trailer: {}
6464
content_length: 175
6565
uncompressed: false
66-
body: '{"data":{"id":"93188503-4438-4ca4-a1bb-a13c202fc9a7","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
66+
body: '{"data":{"id":"a9cf4842-ed7a-4ed0-bad1-7dc7af2ea5da","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
6767
headers:
6868
Content-Type:
6969
- application/vnd.api+json
7070
status: 200 OK
7171
code: 200
72-
duration: 164.233875ms
72+
duration: 153.7085ms
7373
- id: 2
7474
request:
7575
proto: HTTP/1.1
@@ -96,13 +96,13 @@ interactions:
9696
trailer: {}
9797
content_length: 175
9898
uncompressed: false
99-
body: '{"data":{"id":"fb682925-c67c-4dfc-b194-5ab4ef2ae18a","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
99+
body: '{"data":{"id":"4d4063eb-e529-41ff-b39a-3994c6700295","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
100100
headers:
101101
Content-Type:
102102
- application/vnd.api+json
103103
status: 200 OK
104104
code: 200
105-
duration: 155.971792ms
105+
duration: 149.562875ms
106106
- id: 3
107107
request:
108108
proto: HTTP/1.1
@@ -129,13 +129,13 @@ interactions:
129129
trailer: {}
130130
content_length: 175
131131
uncompressed: false
132-
body: '{"data":{"id":"0fb48cea-0d82-4232-ad95-4f2c2ac96ca5","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
132+
body: '{"data":{"id":"9ee02489-0894-4c16-a714-bba19277152a","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
133133
headers:
134134
Content-Type:
135135
- application/vnd.api+json
136136
status: 200 OK
137137
code: 200
138-
duration: 167.042708ms
138+
duration: 147.901583ms
139139
- id: 4
140140
request:
141141
proto: HTTP/1.1
@@ -171,7 +171,7 @@ interactions:
171171
- application/vnd.api+json
172172
status: 201 Created
173173
code: 201
174-
duration: 196.586041ms
174+
duration: 164.101333ms
175175
- id: 5
176176
request:
177177
proto: HTTP/1.1
@@ -198,13 +198,13 @@ interactions:
198198
trailer: {}
199199
content_length: 175
200200
uncompressed: false
201-
body: '{"data":{"id":"8d765924-52f9-427c-a4a4-9e437bb5f3fd","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag3:val3","tag1:val1","tag2:val2"]}}}}}'
201+
body: '{"data":{"id":"5d5f19d5-3a69-47ca-9b96-2e8e8cc31159","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag3:val3","tag1:val1","tag2:val2"]}}}}}'
202202
headers:
203203
Content-Type:
204204
- application/vnd.api+json
205205
status: 200 OK
206206
code: 200
207-
duration: 165.923166ms
207+
duration: 133.716125ms
208208
- id: 6
209209
request:
210210
proto: HTTP/1.1
@@ -231,13 +231,13 @@ interactions:
231231
trailer: {}
232232
content_length: 175
233233
uncompressed: false
234-
body: '{"data":{"id":"8c41ffaf-c39f-4240-8af5-a160057ea39a","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag3:val3","tag1:val1","tag2:val2"]}}}}}'
234+
body: '{"data":{"id":"e8190d78-8ada-448c-a6a7-31fa1ef75d29","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":["tag3:val3","tag1:val1","tag2:val2"]}}}}}'
235235
headers:
236236
Content-Type:
237237
- application/vnd.api+json
238238
status: 200 OK
239239
code: 200
240-
duration: 144.249166ms
240+
duration: 152.102166ms
241241
- id: 7
242242
request:
243243
proto: HTTP/1.1
@@ -273,7 +273,7 @@ interactions:
273273
- application/vnd.api+json
274274
status: 201 Created
275275
code: 201
276-
duration: 181.923208ms
276+
duration: 166.117416ms
277277
- id: 8
278278
request:
279279
proto: HTTP/1.1
@@ -300,10 +300,10 @@ interactions:
300300
trailer: {}
301301
content_length: 140
302302
uncompressed: false
303-
body: '{"data":{"id":"a2150b11-a52f-4584-8a9e-bdbe959d8b82","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":[]}}}}}'
303+
body: '{"data":{"id":"612696d3-b877-40b7-9b58-699cd5fcba43","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"123456789":[]}}}}}'
304304
headers:
305305
Content-Type:
306306
- application/vnd.api+json
307307
status: 200 OK
308308
code: 200
309-
duration: 161.934583ms
309+
duration: 144.21425ms

‎datadog/tests/cassettes/TestAccResourceEvaluationFilterImport.freeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025-05-22T09:33:20.762262+01:00
1+
2025-05-22T15:29:56.944065+01:00

‎datadog/tests/cassettes/TestAccResourceEvaluationFilterImport.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ interactions:
3636
- application/vnd.api+json
3737
status: 201 Created
3838
code: 201
39-
duration: 168.291708ms
39+
duration: 158.263ms
4040
- id: 1
4141
request:
4242
proto: HTTP/1.1
@@ -63,13 +63,13 @@ interactions:
6363
trailer: {}
6464
content_length: 175
6565
uncompressed: false
66-
body: '{"data":{"id":"55d6615a-7b8b-453f-ba78-27d2ad05ef25","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
66+
body: '{"data":{"id":"feae3ec8-99c4-4a7a-97a9-51b8a9b1b0bf","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
6767
headers:
6868
Content-Type:
6969
- application/vnd.api+json
7070
status: 200 OK
7171
code: 200
72-
duration: 171.787833ms
72+
duration: 147.323625ms
7373
- id: 2
7474
request:
7575
proto: HTTP/1.1
@@ -96,13 +96,13 @@ interactions:
9696
trailer: {}
9797
content_length: 175
9898
uncompressed: false
99-
body: '{"data":{"id":"278ca348-e6aa-482c-bea8-09f551de96a7","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
99+
body: '{"data":{"id":"c1f73230-6f37-4713-9b13-179049db6f9a","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
100100
headers:
101101
Content-Type:
102102
- application/vnd.api+json
103103
status: 200 OK
104104
code: 200
105-
duration: 157.403042ms
105+
duration: 145.40975ms
106106
- id: 3
107107
request:
108108
proto: HTTP/1.1
@@ -129,13 +129,13 @@ interactions:
129129
trailer: {}
130130
content_length: 175
131131
uncompressed: false
132-
body: '{"data":{"id":"0fdcb999-f497-4ed6-a578-4cbdb88664e4","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
132+
body: '{"data":{"id":"5879db92-6496-4167-ad9e-ac338277964b","type":"csm_resource_filter","attributes":{"cloud_provider":{"aws":{"223456789":["tag1:val1","tag2:val2","tag3:val3"]}}}}}'
133133
headers:
134134
Content-Type:
135135
- application/vnd.api+json
136136
status: 200 OK
137137
code: 200
138-
duration: 154.992625ms
138+
duration: 143.792208ms
139139
- id: 4
140140
request:
141141
proto: HTTP/1.1
@@ -171,4 +171,4 @@ interactions:
171171
- application/vnd.api+json
172172
status: 201 Created
173173
code: 201
174-
duration: 169.999958ms
174+
duration: 172.2335ms

‎datadog/tests/cassettes/TestAccResourceEvaluationFilterInvalid.freeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025-05-22T09:33:22.99662+01:00
1+
2025-05-22T15:29:59.12083+01:00

‎datadog/tests/cassettes/TestAccResourceEvaluationFilterInvalid.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ interactions:
3636
- application/vnd.api+json
3737
status: 400 Bad Request
3838
code: 400
39-
duration: 140.015667ms
39+
duration: 126.966458ms

‎datadog/tests/provider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ var testFiles2EndpointTags = map[string]string{
267267
"tests/resource_datadog_webhook_custom_variable_test": "webhook_custom_variable",
268268
"tests/resource_datadog_webhook_test": "webhook",
269269
"tests/resource_datadog_workflow_automation_test": "workflow_automation",
270-
"tests/resource_datadog_csm_resource_evaluation_filter_test": "resource_filters",
270+
"tests/resource_datadog_compliance_resource_evaluation_filter_test": "resource_filters",
271271
}
272272

273273
// getEndpointTagValue traverses callstack frames to find the test function that invoked this call;

0 commit comments

Comments
 (0)