From 8cb11b28ae1f555f780f82af3e948a97ad485294 Mon Sep 17 00:00:00 2001 From: Matt Burgess <549318+mattburgess@users.noreply.github.com> Date: Mon, 15 Jul 2024 20:51:24 +0100 Subject: [PATCH] d/fsx_common_schema: Migrate to AWS SDK v2 --- .../service/fsx/common_schema_data_source.go | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/internal/service/fsx/common_schema_data_source.go b/internal/service/fsx/common_schema_data_source.go index 3a521ce6486..473b19c8816 100644 --- a/internal/service/fsx/common_schema_data_source.go +++ b/internal/service/fsx/common_schema_data_source.go @@ -4,8 +4,6 @@ package fsx import ( - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/fsx" awstypes "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/flex" @@ -13,16 +11,16 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func newSnapshotFilterList(s *schema.Set) []*awstypes.SnapshotFilter { +func newSnapshotFilterList(s *schema.Set) []awstypes.SnapshotFilter { if s == nil { - return []*awstypes.SnapshotFilter{} + return []awstypes.SnapshotFilter{} } - return tfslices.ApplyToAll(s.List(), func(tfList interface{}) *awstypes.SnapshotFilter { + return tfslices.ApplyToAll(s.List(), func(tfList interface{}) awstypes.SnapshotFilter { tfMap := tfList.(map[string]interface{}) - return &awstypes.SnapshotFilter{ - Name: aws.String(tfMap[names.AttrName].(string)), - Values: flex.ExpandStringList(tfMap[names.AttrValues].([]interface{})), + return awstypes.SnapshotFilter{ + Name: awstypes.SnapshotFilterName(tfMap[names.AttrName].(string)), + Values: flex.ExpandStringValueList(tfMap[names.AttrValues].([]interface{})), } }) } @@ -49,16 +47,16 @@ func snapshotFiltersSchema() *schema.Schema { } } -func newStorageVirtualMachineFilterList(s *schema.Set) []*awstypes.StorageVirtualMachineFilter { +func newStorageVirtualMachineFilterList(s *schema.Set) []awstypes.StorageVirtualMachineFilter { if s == nil { - return []*awstypes.StorageVirtualMachineFilter{} + return []awstypes.StorageVirtualMachineFilter{} } - return tfslices.ApplyToAll(s.List(), func(tfList interface{}) *awstypes.StorageVirtualMachineFilter { + return tfslices.ApplyToAll(s.List(), func(tfList interface{}) awstypes.StorageVirtualMachineFilter { tfMap := tfList.(map[string]interface{}) - return &awstypes.StorageVirtualMachineFilter{ - Name: aws.String(tfMap[names.AttrName].(string)), - Values: flex.ExpandStringList(tfMap[names.AttrValues].([]interface{})), + return awstypes.StorageVirtualMachineFilter{ + Name: awstypes.StorageVirtualMachineFilterName(tfMap[names.AttrName].(string)), + Values: flex.ExpandStringValueList(tfMap[names.AttrValues].([]interface{})), } }) }