Skip to content

Commit cb55a9c

Browse files
committed
tests(edge-services): include PipelineID in all stage ListRequests
1 parent 7fb48fd commit cb55a9c

File tree

1 file changed

+80
-30
lines changed
  • internal/services/edgeservices/testfuncs

1 file changed

+80
-30
lines changed

internal/services/edgeservices/testfuncs/sweep.go

Lines changed: 80 additions & 30 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,6 +216,11 @@ func testSweepWAF(_ string) error {
180216
return acctest.Sweep(func(scwClient *scw.Client) error {
181217
edgeAPI := edge.NewAPI(scwClient)
182218

219+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
220+
if err != nil {
221+
return fmt.Errorf("failed to list pipelines: %w", err)
222+
}
223+
183224
listWAF, err := edgeAPI.ListWafStages(&edge.ListWafStagesRequest{})
184225
if err != nil {
185226
return fmt.Errorf("failed to list WAF stage: %w", err)
@@ -202,17 +243,26 @@ func testSweepRoute(_ string) error {
202243
return acctest.Sweep(func(scwClient *scw.Client) error {
203244
edgeAPI := edge.NewAPI(scwClient)
204245

205-
listRoutes, err := edgeAPI.ListRouteStages(&edge.ListRouteStagesRequest{})
246+
listPipelines, err := edgeAPI.ListPipelines(&edge.ListPipelinesRequest{})
206247
if err != nil {
207-
return fmt.Errorf("failed to list route stage: %w", err)
248+
return fmt.Errorf("failed to list pipelines: %w", err)
208249
}
209250

210-
for _, stage := range listRoutes.Stages {
211-
err = edgeAPI.DeleteRouteStage(&edge.DeleteRouteStageRequest{
212-
RouteStageID: stage.ID,
251+
for _, pipeline := range listPipelines.Pipelines {
252+
listRoutes, err := edgeAPI.ListRouteStages(&edge.ListRouteStagesRequest{
253+
PipelineID: pipeline.ID,
213254
})
214255
if err != nil {
215-
return fmt.Errorf("failed to delete route stage: %w", err)
256+
return fmt.Errorf("failed to list route stage: %w", err)
257+
}
258+
259+
for _, stage := range listRoutes.Stages {
260+
err = edgeAPI.DeleteRouteStage(&edge.DeleteRouteStageRequest{
261+
RouteStageID: stage.ID,
262+
})
263+
if err != nil {
264+
return fmt.Errorf("failed to delete route stage: %w", err)
265+
}
216266
}
217267
}
218268

0 commit comments

Comments
 (0)