Skip to content

Commit 58e4522

Browse files
committed
lint
1 parent 61316ee commit 58e4522

File tree

3 files changed

+173
-310
lines changed

3 files changed

+173
-310
lines changed

internal/services/vpcgw/network.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData,
212212
if httperrors.Is412(err) {
213213
// Fallback to v1 API.
214214
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
215+
215216
gatewayV1, err := waitForVPCGatewayNetwork(ctx, apiV1, zone, ID, d.Timeout(schema.TimeoutRead))
216217
if err != nil {
217218
return diag.FromErr(err)
@@ -245,6 +246,7 @@ func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData
245246
if err != nil {
246247
if httperrors.Is412(err) {
247248
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
249+
248250
_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
249251
if err != nil {
250252
return diag.FromErr(err)
@@ -262,6 +264,7 @@ func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData
262264
if err != nil {
263265
if httperrors.Is412(err) {
264266
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
267+
265268
_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
266269
if err != nil {
267270
return diag.FromErr(err)
@@ -289,6 +292,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
289292
if err != nil {
290293
if httperrors.Is412(err) {
291294
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
295+
292296
_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
293297
if err != nil {
294298
return diag.FromErr(err)
@@ -316,6 +320,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
316320
return nil
317321
case httperrors.Is412(err):
318322
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
323+
319324
_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
320325
if err != nil && !httperrors.Is404(err) {
321326
return diag.FromErr(err)
@@ -332,6 +337,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
332337
return nil
333338
case httperrors.Is412(err):
334339
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
340+
335341
_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
336342
if err != nil && !httperrors.Is404(err) {
337343
return diag.FromErr(err)

internal/services/vpcgw/public_gateway.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ func ResourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m
202202
if httperrors.Is412(err) {
203203
// Fallback to v1 API.
204204
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
205+
205206
gatewayV1, err := waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
206207
if err != nil {
207208
return diag.FromErr(err)
@@ -256,6 +257,7 @@ func ResourceVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData,
256257
if err != nil {
257258
if httperrors.Is412(err) {
258259
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
260+
259261
_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
260262
if err != nil {
261263
return diag.FromErr(err)
@@ -283,6 +285,7 @@ func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData,
283285
if err != nil {
284286
if httperrors.Is412(err) {
285287
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
288+
286289
_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
287290
if err != nil {
288291
return diag.FromErr(err)
@@ -308,6 +311,7 @@ func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData,
308311
return nil
309312
case httperrors.Is412(err):
310313
tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
314+
311315
_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
312316
if err != nil && !httperrors.Is404(err) {
313317
return diag.FromErr(err)

0 commit comments

Comments
 (0)