Skip to content

Commit 0e92ab4

Browse files
estellesoulardestellesoulard
committed
tests: refacto
1 parent 38cce1e commit 0e92ab4

File tree

3 files changed

+802
-3096
lines changed

3 files changed

+802
-3096
lines changed

‎internal/acctest/acctest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ type TestTools struct {
3232
}
3333

3434
var foldersUsingVCRv4 = []string{
35+
"audittrail",
3536
"container",
3637
"instance",
3738
"k8s",
3839
"marketplace",
39-
"audittrail",
4040
}
4141

4242
func FolderUsesVCRv4(fullFolderPath string) bool {

‎internal/services/audittrail/event_data_source_test.go‎

Lines changed: 13 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -59,113 +59,31 @@ func TestAccDataSourceEvent_Basic(t *testing.T) {
5959
data "scaleway_audit_trail_event" "by_project" {
6060
project_id = scaleway_secret.main.project_id
6161
}
62-
`, secretName, project.ID),
63-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_project", orgID),
64-
},
65-
{
66-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
67-
Config: fmt.Sprintf(`
68-
resource "scaleway_secret" "main" {
69-
name = "%s"
70-
description = "DataSourceAuditTrail test description"
71-
project_id = "%s"
72-
}
7362
7463
data "scaleway_audit_trail_event" "by_type" {
7564
project_id = scaleway_secret.main.project_id
7665
resource_type = "%s"
7766
}
78-
`, secretName, project.ID, resourceType),
79-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_type", orgID),
80-
},
81-
{
82-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
83-
Config: fmt.Sprintf(`
84-
resource "scaleway_secret" "main" {
85-
name = "%s"
86-
description = "DataSourceAuditTrail test description"
87-
project_id = "%s"
88-
}
8967
9068
data "scaleway_audit_trail_event" "by_id" {
9169
project_id = scaleway_secret.main.project_id
9270
resource_id = split("/", scaleway_secret.main.id)[1]
9371
}
94-
`, secretName, project.ID),
95-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id", orgID),
96-
},
97-
{
98-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
99-
Config: fmt.Sprintf(`
100-
resource "scaleway_secret" "main" {
101-
name = "%s"
102-
description = "DataSourceAuditTrail test description"
103-
project_id = "%s"
104-
}
10572
10673
data "scaleway_audit_trail_event" "by_id_with_locality" {
10774
project_id = scaleway_secret.main.project_id
10875
resource_id = scaleway_secret.main.id
10976
}
110-
`, secretName, project.ID),
111-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id_with_locality", orgID),
112-
},
113-
{
114-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
115-
Config: fmt.Sprintf(`
116-
resource "scaleway_secret" "main" {
117-
name = "%s"
118-
description = "DataSourceAuditTrail test description"
119-
project_id = "%s"
120-
}
12177
12278
data "scaleway_audit_trail_event" "by_product" {
12379
project_id = scaleway_secret.main.project_id
12480
product_name = "%s"
12581
}
126-
`, secretName, project.ID, productName),
127-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_product", orgID),
128-
},
129-
{
130-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
131-
Config: fmt.Sprintf(`
132-
resource "scaleway_secret" "main" {
133-
name = "%s"
134-
description = "DataSourceAuditTrail test description"
135-
project_id = "%s"
136-
}
13782
13883
data "scaleway_audit_trail_event" "by_service" {
13984
project_id = scaleway_secret.main.project_id
14085
service_name = "%s"
14186
}
142-
`, secretName, project.ID, serviceName),
143-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_service", orgID),
144-
},
145-
{
146-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
147-
Config: fmt.Sprintf(`
148-
resource "scaleway_secret" "main" {
149-
name = "%s"
150-
description = "DataSourceAuditTrail test description"
151-
project_id = "%s"
152-
}
153-
154-
data "scaleway_audit_trail_event" "by_method" {
155-
project_id = scaleway_secret.main.project_id
156-
method_name = "%s"
157-
}
158-
`, secretName, project.ID, methodCreate),
159-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_method", orgID),
160-
},
161-
{
162-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
163-
Config: fmt.Sprintf(`
164-
resource "scaleway_secret" "main" {
165-
name = "%s"
166-
description = "DataSourceAuditTrail test description"
167-
project_id = "%s"
168-
}
16987
17088
data "scaleway_audit_trail_event" "by_method" {
17189
project_id = scaleway_secret.main.project_id
@@ -176,95 +94,45 @@ func TestAccDataSourceEvent_Basic(t *testing.T) {
17694
project_id = scaleway_secret.main.project_id
17795
principal_id = data.scaleway_audit_trail_event.by_method.events.0.principal_id
17896
}
179-
`, secretName, project.ID, methodCreate),
180-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_principal", orgID),
181-
},
182-
{
183-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
184-
Config: fmt.Sprintf(`
185-
resource "scaleway_secret" "main" {
186-
name = "%s"
187-
description = "DataSourceAuditTrail test description"
188-
project_id = "%s"
189-
}
190-
191-
data "scaleway_audit_trail_event" "by_method" {
192-
project_id = scaleway_secret.main.project_id
193-
method_name = "%s"
194-
}
19597
19698
data "scaleway_audit_trail_event" "by_ip" {
19799
project_id = scaleway_secret.main.project_id
198100
source_ip = data.scaleway_audit_trail_event.by_method.events.0.source_ip
199101
}
200-
`, secretName, project.ID, methodCreate),
201-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_ip", orgID),
202-
},
203-
{
204-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
205-
Config: fmt.Sprintf(`
206-
resource "scaleway_secret" "main" {
207-
name = "%s"
208-
description = "DataSourceAuditTrail test description"
209-
project_id = "%s"
210-
}
211102
212103
data "scaleway_audit_trail_event" "by_status" {
213104
project_id = scaleway_secret.main.project_id
214105
status = 200
215106
}
216-
`, secretName, project.ID),
217-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.by_status", orgID),
218-
},
219-
{
220-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
221-
Config: fmt.Sprintf(`
222-
resource "scaleway_secret" "main" {
223-
name = "%s"
224-
description = "DataSourceAuditTrail test description"
225-
project_id = "%s"
226-
}
227107
228108
data "scaleway_audit_trail_event" "recorded_after" {
229109
project_id = scaleway_secret.main.project_id
230110
recorded_after = "%s"
231111
}
232-
`, secretName, project.ID, time.Now().Add(-time.Minute*10).Format(time.RFC3339)),
233-
Check: createEventDataSourceChecks("data.scaleway_audit_trail_event.recorded_after", orgID),
234-
},
235-
{
236-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
237-
Config: fmt.Sprintf(`
238-
resource "scaleway_secret" "main" {
239-
name = "%s"
240-
description = "DataSourceAuditTrail test description"
241-
project_id = "%s"
242-
}
243112
244113
data "scaleway_audit_trail_event" "recorded_before" {
245114
project_id = scaleway_secret.main.project_id
246115
recorded_before = "%s"
247116
}
248-
`, secretName, project.ID, time.Now().Add(-time.Minute*30).Format(time.RFC3339)),
249-
Check: resource.ComposeTestCheckFunc(
250-
resource.TestCheckResourceAttr("data.scaleway_audit_trail_event.recorded_before", "events.#", "0"),
251-
),
252-
},
253-
{
254-
PreConfig: func() { waitForAuditTrailEvents(t, ctx, auditTrailAPI, project) },
255-
Config: fmt.Sprintf(`
256-
resource "scaleway_secret" "main" {
257-
name = "%s"
258-
description = "DataSourceAuditTrail test description"
259-
project_id = "%s"
260-
}
261117
262118
data "scaleway_audit_trail_event" "order_by" {
263119
project_id = scaleway_secret.main.project_id
264120
order_by = "recorded_at_asc"
265121
}
266-
`, secretName, project.ID),
122+
`, secretName, project.ID, resourceType, productName, serviceName, methodCreate, time.Now().Add(-time.Minute*10).Format(time.RFC3339), time.Now().Add(-time.Minute*30).Format(time.RFC3339)),
267123
Check: resource.ComposeTestCheckFunc(
124+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_project", orgID),
125+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_type", orgID),
126+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id", orgID),
127+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id_with_locality", orgID),
128+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_product", orgID),
129+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_service", orgID),
130+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_method", orgID),
131+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_principal", orgID),
132+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_ip", orgID),
133+
createEventDataSourceChecks("data.scaleway_audit_trail_event.by_status", orgID),
134+
createEventDataSourceChecks("data.scaleway_audit_trail_event.recorded_after", orgID),
135+
resource.TestCheckResourceAttr("data.scaleway_audit_trail_event.recorded_before", "events.#", "0"),
268136
resource.TestCheckResourceAttrSet("data.scaleway_audit_trail_event.order_by", "events.#"),
269137
),
270138
},

0 commit comments

Comments
 (0)