From a9ef20eefd7ec3165e0cb6c49d27baf550ffebbe Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 2 Jul 2020 16:04:12 +0200 Subject: [PATCH] In ACI e2e tests, do not wait for full resource group deletion at the end, let ACI clean things UP (timeframe ~45 sec). This is costing GH Action minutes for nothing, and slows test results. --- azure/context_test.go | 2 +- azure/resourcegroup.go | 13 +++++-------- tests/aci-e2e/e2e-aci_test.go | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/azure/context_test.go b/azure/context_test.go index acfdcd80f..87fd3166a 100644 --- a/azure/context_test.go +++ b/azure/context_test.go @@ -221,7 +221,7 @@ func (s *MockResourceGroupHelper) CreateOrUpdate(ctx context.Context, subscripti return args.Get(0).(resources.Group), args.Error(1) } -func (s *MockResourceGroupHelper) Delete(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) { +func (s *MockResourceGroupHelper) DeleteAsync(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) { args := s.Called(ctx, subscriptionID, resourceGroupName) return args.Error(0) } diff --git a/azure/resourcegroup.go b/azure/resourcegroup.go index 1ca9420a5..3cf80b11b 100644 --- a/azure/resourcegroup.go +++ b/azure/resourcegroup.go @@ -32,7 +32,7 @@ type ACIResourceGroupHelper interface { ListGroups(ctx context.Context, subscriptionID string) ([]resources.Group, error) GetGroup(ctx context.Context, subscriptionID string, groupName string) (resources.Group, error) CreateOrUpdate(ctx context.Context, subscriptionID string, resourceGroupName string, parameters resources.Group) (result resources.Group, err error) - Delete(ctx context.Context, subscriptionID string, resourceGroupName string) error + DeleteAsync(ctx context.Context, subscriptionID string, resourceGroupName string) error } type aciResourceGroupHelperImpl struct { @@ -87,18 +87,15 @@ func (mgt aciResourceGroupHelperImpl) CreateOrUpdate(ctx context.Context, subscr return gc.CreateOrUpdate(ctx, resourceGroupName, parameters) } -// Delete deletes a resource group -func (mgt aciResourceGroupHelperImpl) Delete(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) { +// DeleteAsync deletes a resource group. Does not wait for full deletion to return (long operation) +func (mgt aciResourceGroupHelperImpl) DeleteAsync(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) { gc, err := getGroupsClient(subscriptionID) if err != nil { return err } - future, err := gc.Delete(ctx, resourceGroupName) - if err != nil { - return err - } - return future.WaitForCompletionRef(ctx, gc.Client) + _, err = gc.Delete(ctx, resourceGroupName) + return err } // GetSubscriptionIDs Return available subscription IDs based on azure login diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index d10085d40..29c6307bd 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -331,7 +331,7 @@ func deleteResourceGroup(groupName string) { helper := azure.NewACIResourceGroupHelper() models, err := helper.GetSubscriptionIDs(ctx) Expect(err).To(BeNil()) - err = helper.Delete(ctx, *models[0].SubscriptionID, groupName) + err = helper.DeleteAsync(ctx, *models[0].SubscriptionID, groupName) Expect(err).To(BeNil()) }