Migrate internal callers off deprecated function wrappers

Rewrite every in-repo call site (production, tests, examples) from the
deprecated non-context wrappers to their Context variants, inserting
context.Background() to preserve behavior. Deprecated wrappers are left in
place so this is behavior-preserving and builds green on its own.

An AST codemod derives each transform from the wrapper body (single-statement,
Helper-prefixed multi-statement, and variadic forms) and applies it as a text
edit to the original call source, so existing arguments, inline comments, and
formatting are preserved. Signature-changing wrappers (ssh CheckSSH* handlers,
value-to-pointer, logger.Default) were migrated by hand.

Author: james00012

modules/aws/account.go

@@ -65,7 +65,7 @@ func GetAccountIDE(t testing.TestingT) (string, error) {
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetAccountId(t testing.TestingT) string {
-	return GetAccountID(t)
+	return GetAccountIDContext(t, context.Background())
 }
 
 // GetAccountIdE gets the Account ID for the currently logged in IAM User.
@@ -74,7 +74,7 @@ func GetAccountId(t testing.TestingT) string {
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetAccountIdE(t testing.TestingT) (string, error) {
-	return GetAccountIDE(t)
+	return GetAccountIDContextE(t, context.Background())
 }
 
 // ExtractAccountIDFromARN extracts the AWS account ID from an IAM ARN.

modules/aws/account_test.go

@@ -1,6 +1,7 @@
 package aws_test
 
 import (
+	"context"
 	"testing"
 
 	aws "github.com/gruntwork-io/terratest/modules/aws/v2"
@@ -10,7 +11,7 @@ import (
 func TestGetAccountId(t *testing.T) {
 	t.Parallel()
 
-	accountID := aws.GetAccountID(t)
+	accountID := aws.GetAccountIDContext(t, context.Background())
 	assert.Regexp(t, "^[0-9]{12}$", accountID)
 }
 

modules/aws/ami.go

@@ -216,7 +216,7 @@ func GetMostRecentAmiIDE(t testing.TestingT, region string, ownerID string, filt
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetMostRecentAmiId(t testing.TestingT, region string, ownerId string, filters map[string][]string) string {
-	return GetMostRecentAmiID(t, region, ownerId, filters)
+	return GetMostRecentAmiIDContext(t, context.Background(), region, ownerId, filters)
 }
 
 // GetMostRecentAmiIdE gets the ID of the most recent AMI in the given region that has the given owner and matches
@@ -226,7 +226,7 @@ func GetMostRecentAmiId(t testing.TestingT, region string, ownerId string, filte
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetMostRecentAmiIdE(t testing.TestingT, region string, ownerId string, filters map[string][]string) (string, error) {
-	return GetMostRecentAmiIDE(t, region, ownerId, filters)
+	return GetMostRecentAmiIDContextE(t, context.Background(), region, ownerId, filters)
 }
 
 // Image sorting code borrowed from: https://github.com/hashicorp/packer/blob/7f4112ba229309cfc0ebaa10ded2abdfaf1b22c8/builder/amazon/common/step_source_ami_info.go

modules/aws/ami_test.go

@@ -1,6 +1,7 @@
 package aws_test
 
 import (
+	"context"
 	"testing"
 
 	aws "github.com/gruntwork-io/terratest/modules/aws/v2"
@@ -10,48 +11,48 @@ import (
 func TestGetUbuntu1404AmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetUbuntu1404Ami(t, "us-east-1")
+	amiID := aws.GetUbuntu1404AmiContext(t, context.Background(), "us-east-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetUbuntu1604AmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetUbuntu1604Ami(t, "us-west-1")
+	amiID := aws.GetUbuntu1604AmiContext(t, context.Background(), "us-west-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetUbuntu2004AmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetUbuntu2004Ami(t, "us-west-1")
+	amiID := aws.GetUbuntu2004AmiContext(t, context.Background(), "us-west-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetUbuntu2204AmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetUbuntu2204Ami(t, "us-west-1")
+	amiID := aws.GetUbuntu2204AmiContext(t, context.Background(), "us-west-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetCentos7AmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetCentos7Ami(t, "eu-west-1")
+	amiID := aws.GetCentos7AmiContext(t, context.Background(), "eu-west-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetAmazonLinuxAmiReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetAmazonLinuxAmi(t, "ap-southeast-1")
+	amiID := aws.GetAmazonLinuxAmiContext(t, context.Background(), "ap-southeast-1")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }
 
 func TestGetEcsOptimizedAmazonLinuxAmiEReturnsSomeAmi(t *testing.T) {
 	t.Parallel()
 
-	amiID := aws.GetEcsOptimizedAmazonLinuxAmi(t, "us-east-2")
+	amiID := aws.GetEcsOptimizedAmazonLinuxAmiContext(t, context.Background(), "us-east-2")
 	assert.Regexp(t, "^ami-[[:alnum:]]+$", amiID)
 }

modules/aws/asg_test.go

@@ -22,14 +22,14 @@ func TestGetCapacityInfoForAsg(t *testing.T) {
 
 	uniqueID := random.UniqueID()
 	asgName := t.Name() + "-" + uniqueID
-	region := aws.GetRandomStableRegion(t, []string{}, []string{})
+	region := aws.GetRandomStableRegionContext(t, context.Background(), []string{}, []string{})
 
 	defer deleteAutoScalingGroup(t, asgName, region)
 
 	createTestAutoScalingGroup(t, asgName, region, 2)
-	aws.WaitForCapacity(t, asgName, region, 40, 15*time.Second)
+	aws.WaitForCapacityContext(t, context.Background(), asgName, region, 40, 15*time.Second)
 
-	capacityInfo := aws.GetCapacityInfoForAsg(t, asgName, region)
+	capacityInfo := aws.GetCapacityInfoForAsgContext(t, context.Background(), asgName, region)
 	assert.Equal(t, int64(2), capacityInfo.DesiredCapacity)
 	assert.Equal(t, int64(2), capacityInfo.CurrentCapacity)
 	assert.Equal(t, int64(1), capacityInfo.MinCapacity)
@@ -41,33 +41,33 @@ func TestGetInstanceIdsForAsg(t *testing.T) {
 
 	uniqueID := random.UniqueID()
 	asgName := t.Name() + "-" + uniqueID
-	region := aws.GetRandomStableRegion(t, []string{}, []string{})
+	region := aws.GetRandomStableRegionContext(t, context.Background(), []string{}, []string{})
 
 	defer deleteAutoScalingGroup(t, asgName, region)
 
 	createTestAutoScalingGroup(t, asgName, region, 1)
-	aws.WaitForCapacity(t, asgName, region, 40, 15*time.Second)
+	aws.WaitForCapacityContext(t, context.Background(), asgName, region, 40, 15*time.Second)
 
-	instanceIDs := aws.GetInstanceIdsForAsg(t, asgName, region)
+	instanceIDs := aws.GetInstanceIdsForAsgContext(t, context.Background(), asgName, region)
 	assert.Len(t, instanceIDs, 1)
 }
 
 func createTestAutoScalingGroup(t *testing.T, name string, region string, desiredCount int32) {
 	t.Helper()
 
-	azs := aws.GetAvailabilityZones(t, region)
-	ec2Client := aws.NewEc2Client(t, region)
-	imageID := aws.GetAmazonLinuxAmi(t, region)
+	azs := aws.GetAvailabilityZonesContext(t, context.Background(), region)
+	ec2Client := aws.NewEc2ClientContext(t, context.Background(), region)
+	imageID := aws.GetAmazonLinuxAmiContext(t, context.Background(), region)
 	template, err := ec2Client.CreateLaunchTemplate(context.Background(), &ec2.CreateLaunchTemplateInput{
 		LaunchTemplateData: &types.RequestLaunchTemplateData{
 			ImageId:      awsSDK.String(imageID),
-			InstanceType: types.InstanceType(aws.GetRecommendedInstanceType(t, region, []string{"t2.micro, t3.micro", "t2.small", "t3.small"})),
+			InstanceType: types.InstanceType(aws.GetRecommendedInstanceTypeContext(t, context.Background(), region, []string{"t2.micro, t3.micro", "t2.small", "t3.small"})),
 		},
 		LaunchTemplateName: awsSDK.String(name),
 	})
 	require.NoError(t, err)
 
-	asgClient := aws.NewAsgClient(t, region)
+	asgClient := aws.NewAsgClientContext(t, context.Background(), region)
 	param := &autoscaling.CreateAutoScalingGroupInput{
 		AutoScalingGroupName: &name,
 		LaunchTemplate: &autoscalingTypes.LaunchTemplateSpecification{
@@ -95,7 +95,7 @@ func deleteAutoScalingGroup(t *testing.T, name string, region string) {
 	// We have to scale ASG down to 0 before we can delete it
 	scaleAsgToZero(t, name, region)
 
-	asgClient := aws.NewAsgClient(t, region)
+	asgClient := aws.NewAsgClientContext(t, context.Background(), region)
 	input := &autoscaling.DeleteAutoScalingGroupInput{AutoScalingGroupName: awsSDK.String(name)}
 	_, err := asgClient.DeleteAutoScalingGroup(context.Background(), input)
 	require.NoError(t, err)
@@ -106,7 +106,7 @@ func deleteAutoScalingGroup(t *testing.T, name string, region string) {
 	}, 40*time.Minute)
 	require.NoError(t, err)
 
-	ec2Client := aws.NewEc2Client(t, region)
+	ec2Client := aws.NewEc2ClientContext(t, context.Background(), region)
 	_, err = ec2Client.DeleteLaunchTemplate(context.Background(), &ec2.DeleteLaunchTemplateInput{
 		LaunchTemplateName: awsSDK.String(name),
 	})
@@ -116,7 +116,7 @@ func deleteAutoScalingGroup(t *testing.T, name string, region string) {
 func scaleAsgToZero(t *testing.T, name string, region string) {
 	t.Helper()
 
-	asgClient := aws.NewAsgClient(t, region)
+	asgClient := aws.NewAsgClientContext(t, context.Background(), region)
 	input := &autoscaling.UpdateAutoScalingGroupInput{
 		AutoScalingGroupName: awsSDK.String(name),
 		DesiredCapacity:      awsSDK.Int32(0),
@@ -125,7 +125,7 @@ func scaleAsgToZero(t *testing.T, name string, region string) {
 	}
 	_, err := asgClient.UpdateAutoScalingGroup(context.Background(), input)
 	require.NoError(t, err)
-	aws.WaitForCapacity(t, name, region, 40, 15*time.Second)
+	aws.WaitForCapacityContext(t, context.Background(), name, region, 40, 15*time.Second)
 
 	// There is an eventual consistency bug where even though the ASG is scaled down, AWS sometimes still views a
 	// scaling activity so we add a 5-second pause here to work around it.

modules/aws/ec2-files.go

@@ -286,7 +286,7 @@ func FetchFilesFromInstanceContextE(t testing.TestingT, ctx context.Context, aws
 	}
 
 	//nolint:staticcheck,contextcheck // ScpDirFromE has no Context variant yet
-	return ssh.ScpDirFromE(t, scpOptions, useSudo)
+	return ssh.SCPDirFromContextE(t, context.Background(), &scpOptions, useSudo)
 }
 
 // FetchFilesFromInstanceContext looks up the EC2 Instances in the given ASG, looks up the public IPs of those EC2

modules/aws/ec2.go

@@ -62,7 +62,7 @@ func GetPrivateIPOfEc2InstanceE(t testing.TestingT, instanceID string, awsRegion
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetPrivateIpOfEc2Instance(t testing.TestingT, instanceID string, awsRegion string) string {
-	return GetPrivateIPOfEc2Instance(t, instanceID, awsRegion)
+	return GetPrivateIPOfEc2InstanceContext(t, context.Background(), instanceID, awsRegion)
 }
 
 // GetPrivateIpOfEc2InstanceE gets the private IP address of the given EC2 Instance in the given region.
@@ -71,7 +71,7 @@ func GetPrivateIpOfEc2Instance(t testing.TestingT, instanceID string, awsRegion
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetPrivateIpOfEc2InstanceE(t testing.TestingT, instanceID string, awsRegion string) (string, error) {
-	return GetPrivateIPOfEc2InstanceE(t, instanceID, awsRegion)
+	return GetPrivateIPOfEc2InstanceContextE(t, context.Background(), instanceID, awsRegion)
 }
 
 // GetPrivateIpsOfEc2InstancesContextE gets the private IP address of the given EC2 Instance in the given region. Returns a map of instance ID to IP address.
@@ -236,7 +236,7 @@ func GetPublicIPOfEc2InstanceE(t testing.TestingT, instanceID string, awsRegion
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetPublicIpOfEc2Instance(t testing.TestingT, instanceID string, awsRegion string) string {
-	return GetPublicIPOfEc2Instance(t, instanceID, awsRegion)
+	return GetPublicIPOfEc2InstanceContext(t, context.Background(), instanceID, awsRegion)
 }
 
 // GetPublicIpOfEc2InstanceE gets the public IP address of the given EC2 Instance in the given region.
@@ -245,7 +245,7 @@ func GetPublicIpOfEc2Instance(t testing.TestingT, instanceID string, awsRegion s
 //
 //nolint:staticcheck,revive // preserving deprecated function name
 func GetPublicIpOfEc2InstanceE(t testing.TestingT, instanceID string, awsRegion string) (string, error) {
-	return GetPublicIPOfEc2InstanceE(t, instanceID, awsRegion)
+	return GetPublicIPOfEc2InstanceContextE(t, context.Background(), instanceID, awsRegion)
 }
 
 // GetPublicIpsOfEc2InstancesContextE gets the public IP address of the given EC2 Instance in the given region. Returns a map of instance ID to IP address.

modules/aws/ec2_test.go

@@ -1,6 +1,7 @@
 package aws_test
 
 import (
+	"context"
 	"strings"
 	"testing"
 
@@ -16,22 +17,22 @@ import (
 func TestGetEc2InstanceIdsByTag(t *testing.T) {
 	t.Parallel()
 
-	region := aws.GetRandomStableRegion(t, nil, nil)
-	ids, err := aws.GetEc2InstanceIdsByTagE(t, region, "Name", "nonexistent-"+random.UniqueID())
+	region := aws.GetRandomStableRegionContext(t, context.Background(), nil, nil)
+	ids, err := aws.GetEc2InstanceIdsByTagContextE(t, context.Background(), region, "Name", "nonexistent-"+random.UniqueID())
 	require.NoError(t, err)
 	assert.Empty(t, ids)
 }
 
 func TestGetEc2InstanceIdsByFilters(t *testing.T) {
 	t.Parallel()
 
-	region := aws.GetRandomStableRegion(t, nil, nil)
+	region := aws.GetRandomStableRegionContext(t, context.Background(), nil, nil)
 	filters := map[string][]string{
 		"instance-state-name": {"running", "shutting-down"},
 		"tag:Name":            {"nonexistent-" + random.UniqueID()},
 	}
 
-	ids, err := aws.GetEc2InstanceIdsByFiltersE(t, region, filters)
+	ids, err := aws.GetEc2InstanceIdsByFiltersContextE(t, context.Background(), region, filters)
 	require.NoError(t, err)
 	assert.Empty(t, ids)
 }
@@ -55,7 +56,7 @@ func TestGetRecommendedInstanceType(t *testing.T) {
 
 		t.Run(testCase.region+"-"+strings.Join(testCase.instanceTypeOptions, "-"), func(t *testing.T) {
 			t.Parallel()
-			instanceType := aws.GetRecommendedInstanceType(t, testCase.region, testCase.instanceTypeOptions)
+			instanceType := aws.GetRecommendedInstanceTypeContext(t, context.Background(), testCase.region, testCase.instanceTypeOptions)
 			// We could hard-code the expected result (e.g., as of July 2020, we expect eu-west-1 to return t2.micro
 			// and ap-northeast-2 to return t3.micro), but the result will likely change over time, so to avoid a
 			// brittle test, we simply check that we get _one_ result. Combined with the unit test below, this hopefully