Merge pull request #41348 from hashicorp/td-inputs-in-heap-b

Move inputs off heap with autofix: `b`, `t`, and `v` services
hashicorp · Feb 13, 2025 · f8efaa5 · f8efaa5
2 parents 0bd731b + 66778c3
commit f8efaa5
Show file tree

Hide file tree

Showing 62 changed files with 213 additions and 141 deletions.
diff --git a/.ci/semgrep/aws/input-on-heap.yml b/.ci/semgrep/aws/input-on-heap.yml
@@ -51,7 +51,6 @@ rules:
     paths:
       exclude:
         - "internal/service/auditmanager"
-        - "internal/service/b*"
         - "internal/service/c*"
         - "internal/service/d*"
         - "internal/service/e*"
@@ -67,8 +66,6 @@ rules:
         - "internal/service/q*"
         - "internal/service/r*"
         - "internal/service/s*"
-        - "internal/service/t*"
-        - "internal/service/v*"
     patterns:
       - pattern-either:
           - pattern: |

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -245,7 +245,7 @@ val services = mapOf(
     "verifiedaccess" to ServiceSpec("Verified Access", vpcLock = true, patternOverride = "TestAccVerifiedAccess", splitPackageRealPackage = "ec2"),
     "verifiedpermissions" to ServiceSpec("Verified Permissions"),
     "vpc" to ServiceSpec("VPC (Virtual Private Cloud)", vpcLock = true, patternOverride = "TestAccVPC", splitPackageRealPackage = "ec2"),
-    "vpclattice" to ServiceSpec("VPC Lattice"),
+    "vpclattice" to ServiceSpec("VPC Lattice", vpcLock = true, parallelismOverride = 10),
     "vpnclient" to ServiceSpec("VPN (Client)", vpcLock = true, patternOverride = "TestAccClientVPN", splitPackageRealPackage = "ec2"),
     "vpnsite" to ServiceSpec("VPN (Site-to-Site)", vpcLock = true, patternOverride = "TestAccSiteVPN", splitPackageRealPackage = "ec2"),
     "waf" to ServiceSpec("WAF Classic", regionOverride = "us-east-1"),

diff --git a/internal/generate/teamcity/acctest_services.hcl b/internal/generate/teamcity/acctest_services.hcl
@@ -283,6 +283,11 @@ service "vpc" {
   split_package_real_package = "ec2"
 }
 
+service "vpclattice" {
+  vpc_lock    = true
+  parallelism = 10
+}
+
 service "vpnclient" {
   vpc_lock                   = true
   pattern_override           = "TestAccClientVPN"

diff --git a/internal/service/backup/framework_test.go b/internal/service/backup/framework_test.go
@@ -397,7 +397,8 @@ func testAccFramework_disappears(t *testing.T) {
 func testAccFrameworkPreCheck(ctx context.Context, t *testing.T) {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).BackupClient(ctx)
 
-	_, err := conn.ListFrameworks(ctx, &backup.ListFrameworksInput{})
+	input := backup.ListFrameworksInput{}
+	_, err := conn.ListFrameworks(ctx, &input)
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)

diff --git a/internal/service/backup/logically_air_gapped_vault.go b/internal/service/backup/logically_air_gapped_vault.go
@@ -182,9 +182,10 @@ func (r *logicallyAirGappedVaultResource) Delete(ctx context.Context, request re
 
 	conn := r.Meta().BackupClient(ctx)
 
-	_, err := conn.DeleteBackupVault(ctx, &backup.DeleteBackupVaultInput{
+	input := backup.DeleteBackupVaultInput{
 		BackupVaultName: fwflex.StringFromFramework(ctx, data.ID),
-	})
+	}
+	_, err := conn.DeleteBackupVault(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) || tfawserr.ErrCodeEquals(err, errCodeAccessDeniedException) {
 		return

diff --git a/internal/service/backup/report_plan.go b/internal/service/backup/report_plan.go
@@ -241,9 +241,10 @@ func resourceReportPlanDelete(ctx context.Context, d *schema.ResourceData, meta
 	conn := meta.(*conns.AWSClient).BackupClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Backup Report Plan: %s", d.Id())
-	_, err := conn.DeleteReportPlan(ctx, &backup.DeleteReportPlanInput{
+	input := backup.DeleteReportPlanInput{
 		ReportPlanName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteReportPlan(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return diags

diff --git a/internal/service/backup/report_plan_test.go b/internal/service/backup/report_plan_test.go
@@ -235,7 +235,8 @@ func TestAccBackupReportPlan_disappears(t *testing.T) {
 func testAccReportPlanPreCheck(ctx context.Context, t *testing.T) {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).BackupClient(ctx)
 
-	_, err := conn.ListReportPlans(ctx, &backup.ListReportPlansInput{})
+	input := backup.ListReportPlansInput{}
+	_, err := conn.ListReportPlans(ctx, &input)
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)

diff --git a/internal/service/backup/restore_testing_plan.go b/internal/service/backup/restore_testing_plan.go
@@ -285,9 +285,10 @@ func (r *restoreTestingPlanResource) Delete(ctx context.Context, request resourc
 	conn := r.Meta().BackupClient(ctx)
 
 	name := data.RestoreTestingPlanName.ValueString()
-	_, err := conn.DeleteRestoreTestingPlan(ctx, &backup.DeleteRestoreTestingPlanInput{
+	input := backup.DeleteRestoreTestingPlanInput{
 		RestoreTestingPlanName: aws.String(name),
-	})
+	}
+	_, err := conn.DeleteRestoreTestingPlan(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return

diff --git a/internal/service/backup/restore_testing_selection.go b/internal/service/backup/restore_testing_selection.go
@@ -329,10 +329,11 @@ func (r *restoreTestingSelectionResource) Delete(ctx context.Context, request re
 
 	restoreTestingPlanName := data.RestoreTestingPlanName.ValueString()
 	name := data.RestoreTestingSelectionName.ValueString()
-	_, err := conn.DeleteRestoreTestingSelection(ctx, &backup.DeleteRestoreTestingSelectionInput{
+	input := backup.DeleteRestoreTestingSelectionInput{
 		RestoreTestingPlanName:      aws.String(restoreTestingPlanName),
 		RestoreTestingSelectionName: aws.String(name),
-	})
+	}
+	_, err := conn.DeleteRestoreTestingSelection(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return

diff --git a/internal/service/backup/selection.go b/internal/service/backup/selection.go
@@ -303,10 +303,11 @@ func resourceSelectionDelete(ctx context.Context, d *schema.ResourceData, meta i
 	conn := meta.(*conns.AWSClient).BackupClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Backup Selection: %s", d.Id())
-	_, err := conn.DeleteBackupSelection(ctx, &backup.DeleteBackupSelectionInput{
+	input := backup.DeleteBackupSelectionInput{
 		BackupPlanId: aws.String(d.Get("plan_id").(string)),
 		SelectionId:  aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteBackupSelection(ctx, &input)
 
 	if errs.IsA[*awstypes.InvalidParameterValueException](err) {
 		return diags

diff --git a/internal/service/backup/vault.go b/internal/service/backup/vault.go
@@ -169,10 +169,11 @@ func resourceVaultDelete(ctx context.Context, d *schema.ResourceData, meta inter
 				recoveryPointARN := aws.ToString(v.RecoveryPointArn)
 
 				log.Printf("[DEBUG] Deleting Backup Vault recovery point: %s", recoveryPointARN)
-				_, err := conn.DeleteRecoveryPoint(ctx, &backup.DeleteRecoveryPointInput{
+				input := backup.DeleteRecoveryPointInput{
 					BackupVaultName:  aws.String(d.Id()),
 					RecoveryPointArn: aws.String(recoveryPointARN),
-				})
+				}
+				_, err := conn.DeleteRecoveryPoint(ctx, &input)
 
 				if err != nil {
 					errs = append(errs, fmt.Errorf("deleting Backup Vault recovery point (%s): %w", recoveryPointARN, err))
@@ -188,9 +189,10 @@ func resourceVaultDelete(ctx context.Context, d *schema.ResourceData, meta inter
 	}
 
 	log.Printf("[DEBUG] Deleting Backup Vault: %s", d.Id())
-	_, err := conn.DeleteBackupVault(ctx, &backup.DeleteBackupVaultInput{
+	input := backup.DeleteBackupVaultInput{
 		BackupVaultName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteBackupVault(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) || tfawserr.ErrCodeEquals(err, errCodeAccessDeniedException) {
 		return diags

diff --git a/internal/service/backup/vault_lock_configuration.go b/internal/service/backup/vault_lock_configuration.go
@@ -123,9 +123,10 @@ func resourceVaultLockConfigurationDelete(ctx context.Context, d *schema.Resourc
 	conn := meta.(*conns.AWSClient).BackupClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Backup Vault Lock Configuration: %s", d.Id())
-	_, err := conn.DeleteBackupVaultLockConfiguration(ctx, &backup.DeleteBackupVaultLockConfigurationInput{
+	input := backup.DeleteBackupVaultLockConfigurationInput{
 		BackupVaultName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteBackupVaultLockConfiguration(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return diags

diff --git a/internal/service/backup/vault_notifications.go b/internal/service/backup/vault_notifications.go
@@ -118,9 +118,10 @@ func resourceVaultNotificationsDelete(ctx context.Context, d *schema.ResourceDat
 	conn := meta.(*conns.AWSClient).BackupClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Backup Vault Notifications: %s", d.Id())
-	_, err := conn.DeleteBackupVaultNotifications(ctx, &backup.DeleteBackupVaultNotificationsInput{
+	input := backup.DeleteBackupVaultNotificationsInput{
 		BackupVaultName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteBackupVaultNotifications(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return diags

diff --git a/internal/service/backup/vault_policy.go b/internal/service/backup/vault_policy.go
@@ -131,9 +131,10 @@ func resourceVaultPolicyDelete(ctx context.Context, d *schema.ResourceData, meta
 	conn := meta.(*conns.AWSClient).BackupClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Backup Vault Policy (%s)", d.Id())
-	_, err := conn.DeleteBackupVaultAccessPolicy(ctx, &backup.DeleteBackupVaultAccessPolicyInput{
+	input := backup.DeleteBackupVaultAccessPolicyInput{
 		BackupVaultName: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteBackupVaultAccessPolicy(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) || tfawserr.ErrCodeEquals(err, errCodeAccessDeniedException) {
 		return diags

diff --git a/internal/service/backup/vault_test.go b/internal/service/backup/vault_test.go
@@ -243,11 +243,12 @@ func testAccCheckRunDynamoDBTableBackupJob(ctx context.Context, rName string) re
 			AccountID: client.AccountID(ctx),
 			Resource:  fmt.Sprintf("table/%s", rName),
 		}.String()
-		output, err := conn.StartBackupJob(ctx, &backup.StartBackupJobInput{
+		input := backup.StartBackupJobInput{
 			BackupVaultName: aws.String(rName),
 			IamRoleArn:      aws.String(iamRoleARN),
 			ResourceArn:     aws.String(resourceARN),
-		})
+		}
+		output, err := conn.StartBackupJob(ctx, &input)
 
 		if err != nil {
 			return fmt.Errorf("error starting Backup Job: %w", err)

diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go
@@ -531,10 +531,11 @@ func resourceComputeEnvironmentDelete(ctx context.Context, d *schema.ResourceDat
 	conn := meta.(*conns.AWSClient).BatchClient(ctx)
 
 	log.Printf("[DEBUG] Disabling Batch Compute Environment: %s", d.Id())
-	_, err := conn.UpdateComputeEnvironment(ctx, &batch.UpdateComputeEnvironmentInput{
+	updateInput := batch.UpdateComputeEnvironmentInput{
 		ComputeEnvironment: aws.String(d.Id()),
 		State:              awstypes.CEStateDisabled,
-	})
+	}
+	_, err := conn.UpdateComputeEnvironment(ctx, &updateInput)
 
 	if errs.IsAErrorMessageContains[*awstypes.ClientException](err, "does not exist") {
 		return diags
@@ -549,9 +550,10 @@ func resourceComputeEnvironmentDelete(ctx context.Context, d *schema.ResourceDat
 	}
 
 	log.Printf("[DEBUG] Deleting Batch Compute Environment: %s", d.Id())
-	_, err = conn.DeleteComputeEnvironment(ctx, &batch.DeleteComputeEnvironmentInput{
+	deleteInput := batch.DeleteComputeEnvironmentInput{
 		ComputeEnvironment: aws.String(d.Id()),
-	})
+	}
+	_, err = conn.DeleteComputeEnvironment(ctx, &deleteInput)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "deleting Batch Compute Environment (%s): %s", d.Id(), err)

diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go
@@ -997,9 +997,10 @@ func resourceJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, me
 
 		if v := d.Get("deregister_on_new_revision"); v == true {
 			log.Printf("[DEBUG] Deleting previous Batch Job Definition: %s", currentARN)
-			_, err := conn.DeregisterJobDefinition(ctx, &batch.DeregisterJobDefinitionInput{
+			input := batch.DeregisterJobDefinitionInput{
 				JobDefinition: aws.String(currentARN),
-			})
+			}
+			_, err := conn.DeregisterJobDefinition(ctx, &input)
 
 			if err != nil {
 				return sdkdiag.AppendErrorf(diags, "deleting Batch Job Definition (%s): %s", currentARN, err)
@@ -1030,9 +1031,10 @@ func resourceJobDefinitionDelete(ctx context.Context, d *schema.ResourceData, me
 		arn := aws.ToString(jds[i].JobDefinitionArn)
 
 		log.Printf("[DEBUG] Deregistering Batch Job Definition: %s", arn)
-		_, err := conn.DeregisterJobDefinition(ctx, &batch.DeregisterJobDefinitionInput{
+		input := batch.DeregisterJobDefinitionInput{
 			JobDefinition: aws.String(arn),
-		})
+		}
+		_, err := conn.DeregisterJobDefinition(ctx, &input)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "deregistering Batch Job Definition (%s): %s", arn, err)

diff --git a/internal/service/batch/job_queue.go b/internal/service/batch/job_queue.go
@@ -348,10 +348,11 @@ func (r *jobQueueResource) Delete(ctx context.Context, request resource.DeleteRe
 
 	conn := r.Meta().BatchClient(ctx)
 
-	_, err := conn.UpdateJobQueue(ctx, &batch.UpdateJobQueueInput{
+	updateInput := batch.UpdateJobQueueInput{
 		JobQueue: fwflex.StringFromFramework(ctx, data.ID),
 		State:    awstypes.JQStateDisabled,
-	})
+	}
+	_, err := conn.UpdateJobQueue(ctx, &updateInput)
 
 	// "An error occurred (ClientException) when calling the UpdateJobQueue operation: ... does not exist".
 	if errs.IsAErrorMessageContains[*awstypes.ClientException](err, "does not exist") {
@@ -371,9 +372,10 @@ func (r *jobQueueResource) Delete(ctx context.Context, request resource.DeleteRe
 		return
 	}
 
-	_, err = conn.DeleteJobQueue(ctx, &batch.DeleteJobQueueInput{
+	deleteInput := batch.DeleteJobQueueInput{
 		JobQueue: fwflex.StringFromFramework(ctx, data.ID),
-	})
+	}
+	_, err = conn.DeleteJobQueue(ctx, &deleteInput)
 
 	if err != nil {
 		response.Diagnostics.AddError(fmt.Sprintf("deleting Batch Job Queue (%s)", data.ID.ValueString()), err.Error())

diff --git a/internal/service/batch/scheduling_policy.go b/internal/service/batch/scheduling_policy.go
@@ -168,9 +168,10 @@ func resourceSchedulingPolicyDelete(ctx context.Context, d *schema.ResourceData,
 	conn := meta.(*conns.AWSClient).BatchClient(ctx)
 
 	log.Printf("[DEBUG] Deleting Batch Scheduling Policy: %s", d.Id())
-	_, err := conn.DeleteSchedulingPolicy(ctx, &batch.DeleteSchedulingPolicyInput{
+	input := batch.DeleteSchedulingPolicyInput{
 		Arn: aws.String(d.Id()),
-	})
+	}
+	_, err := conn.DeleteSchedulingPolicy(ctx, &input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "deleting Batch Scheduling Policy (%s): %s", d.Id(), err)

diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go
@@ -459,9 +459,10 @@ func (r *customModelResource) Delete(ctx context.Context, request resource.Delet
 	}
 
 	if !data.CustomModelARN.IsNull() {
-		_, err := conn.DeleteCustomModel(ctx, &bedrock.DeleteCustomModelInput{
+		input := bedrock.DeleteCustomModelInput{
 			ModelIdentifier: fwflex.StringFromFramework(ctx, data.CustomModelARN),
-		})
+		}
+		_, err := conn.DeleteCustomModel(ctx, &input)
 
 		if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 			return

diff --git a/internal/service/bedrock/guardrail_version.go b/internal/service/bedrock/guardrail_version.go
@@ -165,10 +165,11 @@ func (r *guardrailVersionResource) Delete(ctx context.Context, request resource.
 		return
 	}
 
-	_, err := conn.DeleteGuardrail(ctx, &bedrock.DeleteGuardrailInput{
+	input := bedrock.DeleteGuardrailInput{
 		GuardrailIdentifier: data.GuardrailARN.ValueStringPointer(),
 		GuardrailVersion:    data.Version.ValueStringPointer(),
-	})
+	}
+	_, err := conn.DeleteGuardrail(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return

diff --git a/internal/service/bedrock/inference_profile_test.go b/internal/service/bedrock/inference_profile_test.go
@@ -203,9 +203,10 @@ func testAccCheckInferenceProfileExists(ctx context.Context, name string, infere
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).BedrockClient(ctx)
 
-		resp, err := conn.GetInferenceProfile(ctx, &bedrock.GetInferenceProfileInput{
+		input := bedrock.GetInferenceProfileInput{
 			InferenceProfileIdentifier: aws.String(rs.Primary.ID),
-		})
+		}
+		resp, err := conn.GetInferenceProfile(ctx, &input)
 		if err != nil {
 			return create.Error(names.Bedrock, create.ErrActionCheckingExistence, tfbedrock.ResNameInferenceProfile, rs.Primary.ID, err)
 		}

diff --git a/internal/service/bedrock/model_invocation_logging_configuration.go b/internal/service/bedrock/model_invocation_logging_configuration.go
@@ -179,7 +179,8 @@ func (r *resourceModelInvocationLoggingConfiguration) Delete(ctx context.Context
 
 	conn := r.Meta().BedrockClient(ctx)
 
-	_, err := conn.DeleteModelInvocationLoggingConfiguration(ctx, &bedrock.DeleteModelInvocationLoggingConfigurationInput{})
+	input := bedrock.DeleteModelInvocationLoggingConfigurationInput{}
+	_, err := conn.DeleteModelInvocationLoggingConfiguration(ctx, &input)
 
 	if err != nil {
 		response.Diagnostics.AddError(fmt.Sprintf("deleting Bedrock Model Invocation Logging Configuration (%s)", data.ID.ValueString()), err.Error())

diff --git a/internal/service/bedrock/provisioned_model_throughput.go b/internal/service/bedrock/provisioned_model_throughput.go
@@ -185,9 +185,10 @@ func (r *resourceProvisionedModelThroughput) Delete(ctx context.Context, request
 
 	conn := r.Meta().BedrockClient(ctx)
 
-	_, err := conn.DeleteProvisionedModelThroughput(ctx, &bedrock.DeleteProvisionedModelThroughputInput{
+	input := bedrock.DeleteProvisionedModelThroughputInput{
 		ProvisionedModelId: fwflex.StringFromFramework(ctx, data.ID),
-	})
+	}
+	_, err := conn.DeleteProvisionedModelThroughput(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return

diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go
@@ -388,10 +388,11 @@ func (r *agentResource) Delete(ctx context.Context, request resource.DeleteReque
 	conn := r.Meta().BedrockAgentClient(ctx)
 
 	agentID := data.ID.ValueString()
-	_, err := conn.DeleteAgent(ctx, &bedrockagent.DeleteAgentInput{
+	input := bedrockagent.DeleteAgentInput{
 		AgentId:                aws.String(agentID),
 		SkipResourceInUseCheck: fwflex.BoolValueFromFramework(ctx, data.SkipResourceInUseCheck),
-	})
+	}
+	_, err := conn.DeleteAgent(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return

diff --git a/internal/service/bedrockagent/agent_action_group.go b/internal/service/bedrockagent/agent_action_group.go
@@ -386,12 +386,13 @@ func (r *agentActionGroupResource) Delete(ctx context.Context, request resource.
 
 	conn := r.Meta().BedrockAgentClient(ctx)
 
-	_, err := conn.DeleteAgentActionGroup(ctx, &bedrockagent.DeleteAgentActionGroupInput{
+	input := bedrockagent.DeleteAgentActionGroupInput{
 		ActionGroupId:          fwflex.StringFromFramework(ctx, data.ActionGroupID),
 		AgentId:                fwflex.StringFromFramework(ctx, data.AgentID),
 		AgentVersion:           fwflex.StringFromFramework(ctx, data.AgentVersion),
 		SkipResourceInUseCheck: data.SkipResourceInUseCheck.ValueBool(),
-	})
+	}
+	_, err := conn.DeleteAgentActionGroup(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return