From fb267dd1dc3bcf1f4f89b4ba6e94dacb1c6cf30a Mon Sep 17 00:00:00 2001 From: Davor Kapsa Date: Wed, 9 Oct 2019 21:08:40 +0200 Subject: [PATCH 1/3] Add error check --- builder/azure/arm/step_delete_resource_group.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builder/azure/arm/step_delete_resource_group.go b/builder/azure/arm/step_delete_resource_group.go index 8e873c2d7..8490dbc58 100644 --- a/builder/azure/arm/step_delete_resource_group.go +++ b/builder/azure/arm/step_delete_resource_group.go @@ -108,6 +108,9 @@ func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, } return err }) + if err != nil { + return err + } if err = deploymentOperations.Next(); err != nil { return err From 4c615341ef5f9a02481339cb98c0fb016861b033 Mon Sep 17 00:00:00 2001 From: Davor Kapsa Date: Thu, 10 Oct 2019 17:33:24 +0200 Subject: [PATCH 2/3] Ignore retry.Config var retry.Config is struct. Call it err is wrong. --- builder/azure/arm/step_delete_resource_group.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builder/azure/arm/step_delete_resource_group.go b/builder/azure/arm/step_delete_resource_group.go index 8490dbc58..572b22884 100644 --- a/builder/azure/arm/step_delete_resource_group.go +++ b/builder/azure/arm/step_delete_resource_group.go @@ -95,7 +95,7 @@ func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, resourceType, resourceName)) - err := retry.Config{ + _ = retry.Config{ Tries: 10, RetryDelay: (&retry.Backoff{InitialBackoff: 10 * time.Second, MaxBackoff: 600 * time.Second, Multiplier: 2}).Linear, }.Run(ctx, func(ctx context.Context) error { @@ -108,9 +108,6 @@ func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, } return err }) - if err != nil { - return err - } if err = deploymentOperations.Next(); err != nil { return err From 29a6938de6541b73e9534589a8ce2619cd9769ae Mon Sep 17 00:00:00 2001 From: Davor Kapsa Date: Thu, 10 Oct 2019 20:48:26 +0200 Subject: [PATCH 3/3] clean and return nil for retry.Config --- builder/azure/arm/step_delete_resource_group.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/azure/arm/step_delete_resource_group.go b/builder/azure/arm/step_delete_resource_group.go index 572b22884..aac1c4b91 100644 --- a/builder/azure/arm/step_delete_resource_group.go +++ b/builder/azure/arm/step_delete_resource_group.go @@ -95,7 +95,7 @@ func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, resourceType, resourceName)) - _ = retry.Config{ + retry.Config{ Tries: 10, RetryDelay: (&retry.Backoff{InitialBackoff: 10 * time.Second, MaxBackoff: 600 * time.Second, Multiplier: 2}).Linear, }.Run(ctx, func(ctx context.Context) error { @@ -106,7 +106,7 @@ func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, if err != nil { s.reportIfError(err, resourceName) } - return err + return nil }) if err = deploymentOperations.Next(); err != nil {