Skip to content

Commit 790d229

Browse files
yfodilyfodil
authored
tests(edge-services): include PipelineID in all stage ListRequests (#3066)
* tests(edge-services): include PipelineID in all stage ListRequests * fix * fix
1 parent 7fb48fd commit 790d229

File tree

1 file changed

+90
-36
lines changed
  • internal/services/edgeservices/testfuncs

1 file changed

+90
-36
lines changed

‎internal/services/edgeservices/testfuncs/sweep.go

Lines changed: 90 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,26 @@ func testSweepDNS(_ string) error {
7070
return acctest.Sweep(func(scwClient *scw.Client) error {
7171
edgeAPI := edge.NewAPI(scwClient)
7272

73-
listDNS, err := edgeAPI.ListDNSStages(&edge.ListDNSStagesRequest{})
73+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
7474
if err != nil {
75-
return fmt.Errorf("failed to list DNS stages: %w", err)
75+
return fmt.Errorf("failed to list pipelines: %w", err)
7676
}
7777

78-
for _, stage := range listDNS.Stages {
79-
err = edgeAPI.DeleteDNSStage(&edge.DeleteDNSStageRequest{
80-
DNSStageID: stage.ID,
78+
for _, pipeline := range listPipelines.Pipelines {
79+
listDNS, err := edgeAPI.ListDNSStages(&edge.ListDNSStagesRequest{
80+
PipelineID: pipeline.ID,
8181
})
8282
if err != nil {
83-
return fmt.Errorf("failed to delete DNS stage: %w", err)
83+
return fmt.Errorf("failed to list DNS stages: %w", err)
84+
}
85+
86+
for _, stage := range listDNS.Stages {
87+
err = edgeAPI.DeleteDNSStage(&edge.DeleteDNSStageRequest{
88+
DNSStageID: stage.ID,
89+
})
90+
if err != nil {
91+
return fmt.Errorf("failed to delete DNS stage: %w", err)
92+
}
8493
}
8594
}
8695

@@ -92,17 +101,26 @@ func testSweepTLS(_ string) error {
92101
return acctest.Sweep(func(scwClient *scw.Client) error {
93102
edgeAPI := edge.NewAPI(scwClient)
94103

95-
listTLS, err := edgeAPI.ListTLSStages(&edge.ListTLSStagesRequest{})
104+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
96105
if err != nil {
97-
return fmt.Errorf("failed to list TLS stages: %w", err)
106+
return fmt.Errorf("failed to list pipelines: %w", err)
98107
}
99108

100-
for _, stage := range listTLS.Stages {
101-
err = edgeAPI.DeleteTLSStage(&edge.DeleteTLSStageRequest{
102-
TLSStageID: stage.ID,
109+
for _, pipeline := range listPipelines.Pipelines {
110+
listTLS, err := edgeAPI.ListTLSStages(&edge.ListTLSStagesRequest{
111+
PipelineID: pipeline.ID,
103112
})
104113
if err != nil {
105-
return fmt.Errorf("failed to delete TLS stage: %w", err)
114+
return fmt.Errorf("failed to list TLS stages: %w", err)
115+
}
116+
117+
for _, stage := range listTLS.Stages {
118+
err = edgeAPI.DeleteTLSStage(&edge.DeleteTLSStageRequest{
119+
TLSStageID: stage.ID,
120+
})
121+
if err != nil {
122+
return fmt.Errorf("failed to delete TLS stage: %w", err)
123+
}
106124
}
107125
}
108126

@@ -114,17 +132,26 @@ func testSweepCache(_ string) error {
114132
return acctest.Sweep(func(scwClient *scw.Client) error {
115133
edgeAPI := edge.NewAPI(scwClient)
116134

117-
listCaches, err := edgeAPI.ListCacheStages(&edge.ListCacheStagesRequest{})
135+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
118136
if err != nil {
119-
return fmt.Errorf("failed to list cache stages: %w", err)
137+
return fmt.Errorf("failed to list pipelines: %w", err)
120138
}
121139

122-
for _, stage := range listCaches.Stages {
123-
err = edgeAPI.DeleteCacheStage(&edge.DeleteCacheStageRequest{
124-
CacheStageID: stage.ID,
140+
for _, pipeline := range listPipelines.Pipelines {
141+
listCaches, err := edgeAPI.ListCacheStages(&edge.ListCacheStagesRequest{
142+
PipelineID: pipeline.ID,
125143
})
126144
if err != nil {
127-
return fmt.Errorf("failed to delete cache stage: %w", err)
145+
return fmt.Errorf("failed to list cache stages: %w", err)
146+
}
147+
148+
for _, stage := range listCaches.Stages {
149+
err = edgeAPI.DeleteCacheStage(&edge.DeleteCacheStageRequest{
150+
CacheStageID: stage.ID,
151+
})
152+
if err != nil {
153+
return fmt.Errorf("failed to delete cache stage: %w", err)
154+
}
128155
}
129156
}
130157

@@ -136,17 +163,26 @@ func testSweepBackend(_ string) error {
136163
return acctest.Sweep(func(scwClient *scw.Client) error {
137164
edgeAPI := edge.NewAPI(scwClient)
138165

139-
listBackends, err := edgeAPI.ListBackendStages(&edge.ListBackendStagesRequest{})
166+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
140167
if err != nil {
141-
return fmt.Errorf("failed to list backend stage: %w", err)
168+
return fmt.Errorf("failed to list pipelines: %w", err)
142169
}
143170

144-
for _, stage := range listBackends.Stages {
145-
err = edgeAPI.DeleteBackendStage(&edge.DeleteBackendStageRequest{
146-
BackendStageID: stage.ID,
171+
for _, pipeline := range listPipelines.Pipelines {
172+
listBackends, err := edgeAPI.ListBackendStages(&edge.ListBackendStagesRequest{
173+
PipelineID: pipeline.ID,
147174
})
148175
if err != nil {
149-
return fmt.Errorf("failed to delete backend stage: %w", err)
176+
return fmt.Errorf("failed to list backend stage: %w", err)
177+
}
178+
179+
for _, stage := range listBackends.Stages {
180+
err = edgeAPI.DeleteBackendStage(&edge.DeleteBackendStageRequest{
181+
BackendStageID: stage.ID,
182+
})
183+
if err != nil {
184+
return fmt.Errorf("failed to delete backend stage: %w", err)
185+
}
150186
}
151187
}
152188

@@ -180,17 +216,26 @@ func testSweepWAF(_ string) error {
180216
return acctest.Sweep(func(scwClient *scw.Client) error {
181217
edgeAPI := edge.NewAPI(scwClient)
182218

183-
listWAF, err := edgeAPI.ListWafStages(&edge.ListWafStagesRequest{})
219+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
184220
if err != nil {
185-
return fmt.Errorf("failed to list WAF stage: %w", err)
221+
return fmt.Errorf("failed to list pipelines: %w", err)
186222
}
187223

188-
for _, stage := range listWAF.Stages {
189-
err = edgeAPI.DeleteWafStage(&edge.DeleteWafStageRequest{
190-
WafStageID: stage.ID,
224+
for _, pipeline := range listPipelines.Pipelines {
225+
listWAF, err := edgeAPI.ListWafStages(&edge.ListWafStagesRequest{
226+
PipelineID: pipeline.ID,
191227
})
192228
if err != nil {
193-
return fmt.Errorf("failed to delete WAF stage: %w", err)
229+
return fmt.Errorf("failed to list WAF stage: %w", err)
230+
}
231+
232+
for _, stage := range listWAF.Stages {
233+
err = edgeAPI.DeleteWafStage(&edge.DeleteWafStageRequest{
234+
WafStageID: stage.ID,
235+
})
236+
if err != nil {
237+
return fmt.Errorf("failed to delete WAF stage: %w", err)
238+
}
194239
}
195240
}
196241

@@ -202,17 +247,26 @@ func testSweepRoute(_ string) error {
202247
return acctest.Sweep(func(scwClient *scw.Client) error {
203248
edgeAPI := edge.NewAPI(scwClient)
204249

205-
listRoutes, err := edgeAPI.ListRouteStages(&edge.ListRouteStagesRequest{})
250+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
206251
if err != nil {
207-
return fmt.Errorf("failed to list route stage: %w", err)
252+
return fmt.Errorf("failed to list pipelines: %w", err)
208253
}
209254

210-
for _, stage := range listRoutes.Stages {
211-
err = edgeAPI.DeleteRouteStage(&edge.DeleteRouteStageRequest{
212-
RouteStageID: stage.ID,
255+
for _, pipeline := range listPipelines.Pipelines {
256+
listRoutes, err := edgeAPI.ListRouteStages(&edge.ListRouteStagesRequest{
257+
PipelineID: pipeline.ID,
213258
})
214259
if err != nil {
215-
return fmt.Errorf("failed to delete route stage: %w", err)
260+
return fmt.Errorf("failed to list route stage: %w", err)
261+
}
262+
263+
for _, stage := range listRoutes.Stages {
264+
err = edgeAPI.DeleteRouteStage(&edge.DeleteRouteStageRequest{
265+
RouteStageID: stage.ID,
266+
})
267+
if err != nil {
268+
return fmt.Errorf("failed to delete route stage: %w", err)
269+
}
216270
}
217271
}
218272

0 commit comments

Comments
 (0)