diff --git a/platform/api/azure/groups.go b/platform/api/azure/groups.go index 483e6206f..53228d7c5 100644 --- a/platform/api/azure/groups.go +++ b/platform/api/azure/groups.go @@ -18,7 +18,6 @@ import ( "context" "time" - azruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" ) @@ -58,11 +57,7 @@ func (a *API) TerminateResourceGroup(name string) error { opts := &armresources.ResourceGroupsClientBeginDeleteOptions{ ForceDeletionTypes: to.Ptr("Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets"), } - poller, err := a.rgClient.BeginDelete(context.TODO(), name, opts) - pollOpts := &azruntime.PollUntilDoneOptions{ - Frequency: 15 * time.Second, - } - _, err = poller.PollUntilDone(context.TODO(), pollOpts) + _, err := a.rgClient.BeginDelete(context.TODO(), name, opts) return err } diff --git a/platform/api/azure/instance.go b/platform/api/azure/instance.go index 5d17fa217..8f878cb15 100644 --- a/platform/api/azure/instance.go +++ b/platform/api/azure/instance.go @@ -294,12 +294,9 @@ func (a *API) TerminateInstance(machine *Machine, resourceGroup string) error { _, err := a.compClient.BeginDelete(context.TODO(), resourceGroup, machine.ID, &armcompute.VirtualMachinesClientBeginDeleteOptions{ ForceDeletion: to.Ptr(true), }) - if err != nil { - return err - } // We used to wait for the VM to be deleted here, but it's not necessary as // we will also delete resource group later. - return nil + return err } func (a *API) GetConsoleOutput(name, resourceGroup, storageAccount string) ([]byte, error) {