Inline WaitGroup.Spawn

pkg/controller/ec2/instance/controller.go

@@ -18,6 +18,7 @@ package instance
 
 import (
 	"context"
+	"sync"
 	"sync/atomic"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -180,15 +181,17 @@ func (e *external) describeInstance(ctx context.Context, instanceId string) (
 	awsec2.DescribeInstanceAttributeOutput,
 	error,
 ) {
-	wg := WaitGroup{}
+	wg := sync.WaitGroup{}
 
 	var describeOutput *awsec2.DescribeInstancesOutput
 	var describeError error
-	wg.Spawn(func() {
+	wg.Add(1)
+	go func() {
 		describeOutput, describeError = e.client.DescribeInstances(ctx, &awsec2.DescribeInstancesInput{
 			InstanceIds: []string{instanceId},
 		})
-	})
+		wg.Done()
+	}()
 
 	attrs := awsec2.DescribeInstanceAttributeOutput{}
 	attrsErr := atomic.Pointer[error]{}
@@ -199,29 +202,35 @@ func (e *external) describeInstance(ctx context.Context, instanceId string) (
 		})
 	}
 
-	wg.Spawn(func() {
+	wg.Add(1)
+	go func() {
 		if r, err := descAttr(types.InstanceAttributeNameDisableApiTermination); err != nil {
 			attrsErr.Store(&err)
 		} else {
 			attrs.DisableApiTermination = r.DisableApiTermination
 		}
-	})
+		wg.Done()
+	}()
 
-	wg.Spawn(func() {
+	wg.Add(1)
+	go func() {
 		if r, err := descAttr(types.InstanceAttributeNameInstanceInitiatedShutdownBehavior); err != nil {
 			attrsErr.Store(&err)
 		} else {
 			attrs.InstanceInitiatedShutdownBehavior = r.InstanceInitiatedShutdownBehavior
 		}
-	})
+		wg.Done()
+	}()
 
-	wg.Spawn(func() {
+	wg.Add(1)
+	go func() {
 		if r, err := descAttr(types.InstanceAttributeNameUserData); err != nil {
 			attrsErr.Store(&err)
 		} else {
 			attrs.UserData = r.UserData
 		}
-	})
+		wg.Done()
+	}()
 
 	wg.Wait()