Improve AWS AutoScaling group waiter conditions (#486)

* Improve AWS AutoScaling group waiter conditions

* Migrate remaining logs to logrus

Author: 0x2b3bfa0

task/aws/resources/resource_auto_scaling_group.go

@@ -3,7 +3,6 @@ package resources
 import (
 	"context"
 	"errors"
-	"log"
 	"net"
 	"strconv"
 	"time"
@@ -14,7 +13,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling"
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling/types"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
-	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
+
+	"github.com/sirupsen/logrus"
 
 	"terraform-provider-iterative/task/aws/client"
 	"terraform-provider-iterative/task/common"
@@ -93,7 +93,7 @@ func (a *AutoScalingGroup) Create(ctx context.Context) error {
 		AutoScalingGroupNames: []string{a.Identifier},
 	}
 
-	if err := autoscaling.NewGroupInServiceWaiter(a.Client.Services.AutoScaling).Wait(ctx, &waitInput, a.Client.Cloud.Timeouts.Create); err != nil {
+	if err := autoscaling.NewGroupExistsWaiter(a.Client.Services.AutoScaling).Wait(ctx, &waitInput, a.Client.Cloud.Timeouts.Create); err != nil {
 		return err
 	}
 
@@ -134,7 +134,7 @@ func (a *AutoScalingGroup) Read(ctx context.Context) error {
 					if instance.StateReason != nil {
 						status += " " + aws.ToString(instance.StateReason.Message)
 					}
-					log.Println("[DEBUG] AutoScaling Group State:", status)
+					logrus.Debug("AutoScaling Group State:", status)
 					if status == "running" {
 						a.Attributes.Status[common.StatusCodeActive]++
 					}
@@ -209,16 +209,11 @@ func (a *AutoScalingGroup) Delete(ctx context.Context) error {
 		return err
 	}
 
-	waitInput := ec2.DescribeInstancesInput{
-		Filters: []ec2types.Filter{
-			{
-				Name:   aws.String("tag:Name"),
-				Values: []string{a.Dependencies.LaunchTemplate.Identifier},
-			},
-		},
+	waitInput := autoscaling.DescribeAutoScalingGroupsInput{
+		AutoScalingGroupNames: []string{a.Identifier},
 	}
 
-	if err := ec2.NewInstanceTerminatedWaiter(a.Client.Services.EC2).Wait(ctx, &waitInput, a.Client.Cloud.Timeouts.Delete); err != nil {
+	if err := autoscaling.NewGroupNotExistsWaiter(a.Client.Services.AutoScaling).Wait(ctx, &waitInput, a.Client.Cloud.Timeouts.Delete); err != nil {
 		return err
 	}
 

task/az/resources/resource_virtual_machine_scale_set.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 	"regexp"
 	"time"
@@ -15,6 +14,8 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/to"
 
+	"github.com/sirupsen/logrus"
+
 	"terraform-provider-iterative/task/az/client"
 	"terraform-provider-iterative/task/common"
 	"terraform-provider-iterative/task/common/machine"
@@ -244,7 +245,7 @@ func (v *VirtualMachineScaleSet) Read(ctx context.Context) error {
 	if scaleSetView.VirtualMachine.StatusesSummary != nil {
 		for _, status := range *scaleSetView.VirtualMachine.StatusesSummary {
 			code := to.String(status.Code)
-			log.Println("[DEBUG] ScaleSet Status Summary:", code, int(to.Int32(status.Count)))
+			logrus.Debug("ScaleSet Status Summary:", code, int(to.Int32(status.Count)))
 			if code == "ProvisioningState/succeeded" {
 				v.Attributes.Status[common.StatusCodeActive] = int(to.Int32(status.Count))
 			}

task/gcp/resources/resource_instance_group_manager.go

@@ -3,12 +3,13 @@ package resources
 import (
 	"context"
 	"errors"
-	"log"
 	"net"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/sirupsen/logrus"
+
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 
@@ -78,7 +79,7 @@ func (i *InstanceGroupManager) Read(ctx context.Context) error {
 	i.Attributes.Addresses = []net.IP{}
 	i.Attributes.Status = common.Status{common.StatusCodeActive: 0}
 	for _, groupInstance := range groupInstances.Items {
-		log.Println("[DEBUG] Instance Group Manager Status:", groupInstance.Status)
+		logrus.Debug("Instance Group Manager Status:", groupInstance.Status)
 		if groupInstance.Status == "RUNNING" {
 			instance, err := i.Client.Services.Compute.Instances.Get(i.Client.Credentials.ProjectID, i.Client.Region, filepath.Base(groupInstance.Instance)).Do()
 			if err != nil {