Gamelift: Migrate to AWS SDK v2

.teamcity/scripts/provider_tests/acceptance_tests.sh

@@ -45,6 +45,7 @@ TF_ACC=1 go test \
     ./internal/framework/... \
     ./internal/function/... \
     ./internal/generate/... \
+    ./internal/io/... \
     ./internal/json/... \
     ./internal/logging/... \
     ./internal/maps/... \

.teamcity/scripts/provider_tests/unit_tests.sh

@@ -17,6 +17,7 @@ go test \
     ./internal/framework/... \
     ./internal/function/... \
     ./internal/generate/... \
+    ./internal/io/... \
     ./internal/json/... \
     ./internal/logging/... \
     ./internal/maps/... \

go.mod

@@ -115,6 +115,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/fis v1.26.3
 	github.com/aws/aws-sdk-go-v2/service/fms v1.35.3
 	github.com/aws/aws-sdk-go-v2/service/fsx v1.47.2
+	github.com/aws/aws-sdk-go-v2/service/gamelift v1.33.3
 	github.com/aws/aws-sdk-go-v2/service/glacier v1.24.3
 	github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.27.0
 	github.com/aws/aws-sdk-go-v2/service/glue v1.93.0

go.sum

@@ -250,6 +250,8 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.35.3 h1:QeYAz3JhpkTxkS+fifDBfmgWFdSR
 github.com/aws/aws-sdk-go-v2/service/fms v1.35.3/go.mod h1:GXASgVouW5X/bmEgOoV/tkzJkp5ib7ZeA+YxMc5piqs=
 github.com/aws/aws-sdk-go-v2/service/fsx v1.47.2 h1:EDZ4UX4c8NJl5Zm2tj1OlbVdNA0wv2xNt55L6g38Va4=
 github.com/aws/aws-sdk-go-v2/service/fsx v1.47.2/go.mod h1:OKCxqzNOd8LpwsIgoWIhjTkDONHuv3uLoObiT/fbS4Q=
+github.com/aws/aws-sdk-go-v2/service/gamelift v1.33.3 h1:VPxT+CQtkd3KB2UHF851tDSUcfExpJCY/Jc/KuuZ1x0=
+github.com/aws/aws-sdk-go-v2/service/gamelift v1.33.3/go.mod h1:qwK24U3+b0JBk154r1NkgAJzMfV3qUVktUB2WrBtFwc=
 github.com/aws/aws-sdk-go-v2/service/glacier v1.24.3 h1:de8RU808VMx8km6t2wY3WDWigB6GqbNEcyVQRJFaIYs=
 github.com/aws/aws-sdk-go-v2/service/glacier v1.24.3/go.mod h1:F/qjepwnxPHHUTK9ikZp14jLyrvB18kZ/22MmaPxtHE=
 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.27.0 h1:nlm6tZX8gwsVktDKTQe3IOagNVK1+6CGf9IpdWM6x+E=

internal/io/read_file.go

@@ -0,0 +1,28 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package io
+
+import (
+	"os"
+
+	homedir "github.com/mitchellh/go-homedir"
+)
+
+// ReadFileContents reads the contents of a file into memory.
+// Usually a call to this function is protected by an exclusive lock (per resource type)
+// to prevent memory exhaustion (e.g. `conns.GlobalMutexKV.Lock`).
+// See https://github.com/hashicorp/terraform/issues/9364.
+func ReadFileContents(v string) ([]byte, error) {
+	filename, err := homedir.Expand(v)
+	if err != nil {
+		return nil, err
+	}
+
+	fileContent, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	return fileContent, nil
+}

internal/service/autoscaling/exports.go

@@ -0,0 +1,10 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package autoscaling
+
+// Exports for use in other modules.
+var (
+	FindGroupByName               = findGroupByName
+	FindScalingPolicyByTwoPartKey = findScalingPolicyByTwoPartKey
+)

internal/service/autoscaling/exports_test.go

@@ -17,12 +17,10 @@ var (
 
 	FindAttachmentByLoadBalancerName          = findAttachmentByLoadBalancerName
 	FindAttachmentByTargetGroupARN            = findAttachmentByTargetGroupARN
-	FindGroupByName                           = findGroupByName
 	FindInstanceRefreshes                     = findInstanceRefreshes
 	FindLaunchConfigurationByName             = findLaunchConfigurationByName
 	FindLifecycleHookByTwoPartKey             = findLifecycleHookByTwoPartKey
 	FindNotificationsByTwoPartKey             = findNotificationsByTwoPartKey
-	FindScalingPolicyByTwoPartKey             = findScalingPolicyByTwoPartKey
 	FindScheduleByTwoPartKey                  = findScheduleByTwoPartKey
 	FindTag                                   = findTag
 	FindTrafficSourceAttachmentByThreePartKey = findTrafficSourceAttachmentByThreePartKey

internal/service/autoscaling/policy.go

@@ -510,9 +510,8 @@ func resourcePolicyCreate(ctx context.Context, d *schema.ResourceData, meta inte
 
 	name := d.Get(names.AttrName).(string)
 	input, err := expandPutScalingPolicyInput(d)
-
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "creating Auto Scaling Policy (%s): %s", name, err)
+		return sdkdiag.AppendFromErr(diags, err)
 	}
 
 	_, err = conn.PutScalingPolicy(ctx, input)
@@ -572,9 +571,8 @@ func resourcePolicyUpdate(ctx context.Context, d *schema.ResourceData, meta inte
 	conn := meta.(*conns.AWSClient).AutoScalingClient(ctx)
 
 	input, err := expandPutScalingPolicyInput(d)
-
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "updating Auto Scaling Policy (%s): %s", d.Id(), err)
+		return sdkdiag.AppendFromErr(diags, err)
 	}
 
 	_, err = conn.PutScalingPolicy(ctx, input)

internal/service/connect/contact_flow.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"os"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -19,10 +18,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	tfio "github.com/hashicorp/terraform-provider-aws/internal/io"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
-	"github.com/mitchellh/go-homedir"
 )
 
 const contactFlowMutexKey = `aws_connect_contact_flow`
@@ -120,11 +119,13 @@ func resourceContactFlowCreate(ctx context.Context, d *schema.ResourceData, meta
 		// See https://github.com/hashicorp/terraform/issues/9364
 		conns.GlobalMutexKV.Lock(contactFlowMutexKey)
 		defer conns.GlobalMutexKV.Unlock(contactFlowMutexKey)
-		file, err := resourceContactFlowLoadFileContent(filename)
+
+		file, err := tfio.ReadFileContents(filename)
 		if err != nil {
-			return sdkdiag.AppendErrorf(diags, "unable to load %q: %s", filename, err)
+			return sdkdiag.AppendFromErr(diags, err)
 		}
-		input.Content = aws.String(file)
+
+		input.Content = aws.String(string(file))
 	} else if v, ok := d.GetOk(names.AttrContent); ok {
 		input.Content = aws.String(v.(string))
 	}
@@ -226,11 +227,13 @@ func resourceContactFlowUpdate(ctx context.Context, d *schema.ResourceData, meta
 			// See https://github.com/hashicorp/terraform/issues/9364
 			conns.GlobalMutexKV.Lock(contactFlowMutexKey)
 			defer conns.GlobalMutexKV.Unlock(contactFlowMutexKey)
-			file, err := resourceContactFlowLoadFileContent(filename)
+
+			file, err := tfio.ReadFileContents(filename)
 			if err != nil {
-				return sdkdiag.AppendErrorf(diags, "unable to load %q: %s", filename, err)
+				return sdkdiag.AppendFromErr(diags, err)
 			}
-			updateContentInput.Content = aws.String(file)
+
+			updateContentInput.Content = aws.String(string(file))
 		} else if v, ok := d.GetOk(names.AttrContent); ok {
 			updateContentInput.Content = aws.String(v.(string))
 		}
@@ -281,15 +284,3 @@ func ContactFlowParseID(id string) (string, string, error) {
 
 	return parts[0], parts[1], nil
 }
-
-func resourceContactFlowLoadFileContent(filename string) (string, error) {
-	filename, err := homedir.Expand(filename)
-	if err != nil {
-		return "", err
-	}
-	fileContent, err := os.ReadFile(filename)
-	if err != nil {
-		return "", err
-	}
-	return string(fileContent), nil
-}

internal/service/connect/contact_flow_module.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"os"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -19,10 +18,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	tfio "github.com/hashicorp/terraform-provider-aws/internal/io"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
-	"github.com/mitchellh/go-homedir"
 )
 
 const contactFlowModuleMutexKey = `aws_connect_contact_flow_module`
@@ -114,11 +113,13 @@ func resourceContactFlowModuleCreate(ctx context.Context, d *schema.ResourceData
 		// See https://github.com/hashicorp/terraform/issues/9364
 		conns.GlobalMutexKV.Lock(contactFlowModuleMutexKey)
 		defer conns.GlobalMutexKV.Unlock(contactFlowModuleMutexKey)
-		file, err := resourceContactFlowModuleLoadFileContent(filename)
+
+		file, err := tfio.ReadFileContents(filename)
 		if err != nil {
-			return sdkdiag.AppendErrorf(diags, "unable to load %q: %s", filename, err)
+			return sdkdiag.AppendFromErr(diags, err)
 		}
-		input.Content = aws.String(file)
+
+		input.Content = aws.String(string(file))
 	} else if v, ok := d.GetOk(names.AttrContent); ok {
 		input.Content = aws.String(v.(string))
 	}
@@ -219,11 +220,13 @@ func resourceContactFlowModuleUpdate(ctx context.Context, d *schema.ResourceData
 			// See https://github.com/hashicorp/terraform/issues/9364
 			conns.GlobalMutexKV.Lock(contactFlowModuleMutexKey)
 			defer conns.GlobalMutexKV.Unlock(contactFlowModuleMutexKey)
-			file, err := resourceContactFlowModuleLoadFileContent(filename)
+
+			file, err := tfio.ReadFileContents(filename)
 			if err != nil {
-				return sdkdiag.AppendErrorf(diags, "unable to load %q: %s", filename, err)
+				return sdkdiag.AppendFromErr(diags, err)
 			}
-			updateContentInput.Content = aws.String(file)
+
+			updateContentInput.Content = aws.String(string(file))
 		} else if v, ok := d.GetOk(names.AttrContent); ok {
 			updateContentInput.Content = aws.String(v.(string))
 		}
@@ -269,15 +272,3 @@ func ContactFlowModuleParseID(id string) (string, string, error) {
 
 	return parts[0], parts[1], nil
 }
-
-func resourceContactFlowModuleLoadFileContent(filename string) (string, error) {
-	filename, err := homedir.Expand(filename)
-	if err != nil {
-		return "", err
-	}
-	fileContent, err := os.ReadFile(filename)
-	if err != nil {
-		return "", err
-	}
-	return string(fileContent), nil
-}