r/aws_gamelift_game_server_group: Reduce visibility.

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/gamelift/exports_test.go

@@ -5,12 +5,14 @@ package gamelift
 
 // Exports for use in tests only.
 var (
-	ResourceAlias = resourceAlias
-	ResourceBuild = resourceBuild
-	ResourceFleet = resourceFleet
+	ResourceAlias           = resourceAlias
+	ResourceBuild           = resourceBuild
+	ResourceFleet           = resourceFleet
+	ResourceGameServerGroup = resourceGameServerGroup
 
-	DiffPortSettings = diffPortSettings
-	FindAliasByID    = findAliasByID
-	FindBuildByID    = findBuildByID
-	FindFleetByID    = findFleetByID
+	DiffPortSettings          = diffPortSettings
+	FindAliasByID             = findAliasByID
+	FindBuildByID             = findBuildByID
+	FindFleetByID             = findFleetByID
+	FindGameServerGroupByName = findGameServerGroupByName
 )

internal/service/gamelift/find.go

@@ -14,31 +14,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
-func FindGameServerGroupByName(ctx context.Context, conn *gamelift.Client, name string) (*awstypes.GameServerGroup, error) {
-	input := &gamelift.DescribeGameServerGroupInput{
-		GameServerGroupName: aws.String(name),
-	}
-
-	output, err := conn.DescribeGameServerGroup(ctx, input)
-
-	if errs.IsA[*awstypes.NotFoundException](err) {
-		return nil, &retry.NotFoundError{
-			LastError:   err,
-			LastRequest: input,
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if output == nil || output.GameServerGroup == nil {
-		return nil, tfresource.NewEmptyResultError(input)
-	}
-
-	return output.GameServerGroup, nil
-}
-
 func FindScriptByID(ctx context.Context, conn *gamelift.Client, id string) (*awstypes.Script, error) {
 	input := &gamelift.DescribeScriptInput{
 		ScriptId: aws.String(id),