Merge pull request #41545 from hashicorp/td-flex-int32-rename

Renames `flex` `Int32` functions to clarify `Int32`/`Int64` conversions

internal/framework/flex/int.go

@@ -58,42 +58,41 @@ func Int64ToFrameworkLegacy(_ context.Context, v *int64) types.Int64 {
 	return types.Int64Value(aws.ToInt64(v))
 }
 
-func Int32ToFramework(ctx context.Context, v *int32) types.Int64 {
+func Int32ToFrameworkInt64(ctx context.Context, v *int32) types.Int64 {
 	var output types.Int64
 
 	must(Flatten(ctx, v, &output))
 
 	return output
 }
 
-func Int32ValueToFramework(ctx context.Context, v int32) types.Int64 {
+func Int32ValueToFrameworkInt64(ctx context.Context, v int32) types.Int64 {
 	var output types.Int64
 
 	must(Flatten(ctx, v, &output))
 
 	return output
 }
 
-// Int32ToFrameworkLegacy converts an int32 pointer to a Framework Int64 value.
+// Int32ToFrameworkInt64Legacy converts an int32 pointer to a Framework Int64 value.
 // A nil int32 pointer is converted to a zero Int64.
-func Int32ToFrameworkLegacy(_ context.Context, v *int32) types.Int64 {
+func Int32ToFrameworkInt64Legacy(_ context.Context, v *int32) types.Int64 {
 	return types.Int64Value(int64(aws.ToInt32(v)))
 }
 
-// Int32FromFramework coverts a Framework Int64 value to an int32 pointer.
+// Int32FromFrameworkInt64 coverts a Framework Int64 value to an int32 pointer.
 // A null Int64 is converted to a nil int32 pointer.
-func Int32FromFramework(ctx context.Context, v basetypes.Int64Valuable) *int32 {
+func Int32FromFrameworkInt64(ctx context.Context, v basetypes.Int64Valuable) *int32 {
 	var output *int32
 
 	must(Expand(ctx, v, &output))
 
 	return output
 }
 
-// Int32FromFrameworkInt32 coverts a Framework Int32 value to an int32 pointer.
+// Int32FromFramework coverts a Framework Int32 value to an int32 pointer.
 // A null Int32 is converted to a nil int32 pointer.
-// TODO: Rename to Int32FromFramework
-func Int32FromFrameworkInt32(ctx context.Context, v basetypes.Int32Valuable) *int32 {
+func Int32FromFramework(ctx context.Context, v basetypes.Int32Valuable) *int32 {
 	var output *int32
 
 	must(Expand(ctx, v, &output))
@@ -124,8 +123,6 @@ func Int32ValueFromFrameworkInt64(ctx context.Context, v basetypes.Int64Valuable
 	return output
 }
 
-var Int32ValueFromFramework = Int32ValueFromFrameworkInt64
-
 func ZeroInt32AsNull(v types.Int32) types.Int32 {
 	if v.IsNull() || v.IsUnknown() {
 		return v

internal/framework/flex/int_test.go

@@ -122,7 +122,7 @@ func TestInt64ToFrameworkLegacy(t *testing.T) {
 	}
 }
 
-func TestInt32ToFramework(t *testing.T) {
+func TestInt32ToFrameworkInt64(t *testing.T) {
 	t.Parallel()
 
 	type testCase struct {
@@ -148,7 +148,7 @@ func TestInt32ToFramework(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			got := flex.Int32ToFramework(context.Background(), test.input)
+			got := flex.Int32ToFrameworkInt64(context.Background(), test.input)
 
 			if diff := cmp.Diff(got, test.expected); diff != "" {
 				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
@@ -157,7 +157,7 @@ func TestInt32ToFramework(t *testing.T) {
 	}
 }
 
-func TestInt32ToFrameworkLegacy(t *testing.T) {
+func TestInt32ToFrameworkInt64Legacy(t *testing.T) {
 	t.Parallel()
 
 	type testCase struct {
@@ -183,7 +183,7 @@ func TestInt32ToFrameworkLegacy(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			got := flex.Int32ToFrameworkLegacy(context.Background(), test.input)
+			got := flex.Int32ToFrameworkInt64Legacy(context.Background(), test.input)
 
 			if diff := cmp.Diff(got, test.expected); diff != "" {
 				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
@@ -192,7 +192,7 @@ func TestInt32ToFrameworkLegacy(t *testing.T) {
 	}
 }
 
-func TestInt32FromFramework(t *testing.T) {
+func TestInt32FromFrameworkInt64(t *testing.T) {
 	t.Parallel()
 
 	type testCase struct {
@@ -222,7 +222,7 @@ func TestInt32FromFramework(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			got := flex.Int32FromFramework(context.Background(), test.input)
+			got := flex.Int32FromFrameworkInt64(context.Background(), test.input)
 
 			if diff := cmp.Diff(got, test.expected); diff != "" {
 				t.Errorf("unexpected diff (+wanted, -got): %s", diff)

internal/service/batch/job_queue.go

@@ -155,7 +155,7 @@ func (r *jobQueueResource) Create(ctx context.Context, request resource.CreateRe
 	name := data.JobQueueName.ValueString()
 	input := &batch.CreateJobQueueInput{
 		JobQueueName: aws.String(name),
-		Priority:     fwflex.Int32FromFramework(ctx, data.Priority),
+		Priority:     fwflex.Int32FromFrameworkInt64(ctx, data.Priority),
 		State:        awstypes.JQState(data.State.ValueString()),
 		Tags:         getTagsIn(ctx),
 	}
@@ -244,7 +244,7 @@ func (r *jobQueueResource) Read(ctx context.Context, request resource.ReadReques
 	if response.Diagnostics.HasError() {
 		return
 	}
-	data.Priority = fwflex.Int32ToFrameworkLegacy(ctx, jobQueue.Priority)
+	data.Priority = fwflex.Int32ToFrameworkInt64Legacy(ctx, jobQueue.Priority)
 	data.SchedulingPolicyARN = fwflex.StringToFrameworkARN(ctx, jobQueue.SchedulingPolicyArn)
 	data.State = fwflex.StringValueToFramework(ctx, jobQueue.State)
 
@@ -292,7 +292,7 @@ func (r *jobQueueResource) Update(ctx context.Context, request resource.UpdateRe
 		update = true
 	}
 	if !new.Priority.Equal(old.Priority) {
-		input.Priority = fwflex.Int32FromFramework(ctx, new.Priority)
+		input.Priority = fwflex.Int32FromFrameworkInt64(ctx, new.Priority)
 		update = true
 	}
 	if !new.State.Equal(old.State) {

internal/service/computeoptimizer/enrollment_status.go

@@ -111,7 +111,7 @@ func (r *enrollmentStatusResource) Create(ctx context.Context, request resource.
 		return
 	}
 
-	data.NumberOfMemberAccountsOptedIn = fwflex.Int32ToFramework(ctx, output.NumberOfMemberAccountsOptedIn)
+	data.NumberOfMemberAccountsOptedIn = fwflex.Int32ToFrameworkInt64(ctx, output.NumberOfMemberAccountsOptedIn)
 
 	response.Diagnostics.Append(response.State.Set(ctx, &data)...)
 }
@@ -177,7 +177,7 @@ func (r *enrollmentStatusResource) Update(ctx context.Context, request resource.
 		return
 	}
 
-	new.NumberOfMemberAccountsOptedIn = fwflex.Int32ToFramework(ctx, output.NumberOfMemberAccountsOptedIn)
+	new.NumberOfMemberAccountsOptedIn = fwflex.Int32ToFrameworkInt64(ctx, output.NumberOfMemberAccountsOptedIn)
 
 	response.Diagnostics.Append(response.State.Set(ctx, &new)...)
 }

internal/service/configservice/retention_configuration.go

@@ -66,7 +66,7 @@ func (r *retentionConfigurationResource) Create(ctx context.Context, request res
 	conn := r.Meta().ConfigServiceClient(ctx)
 
 	input := &configservice.PutRetentionConfigurationInput{
-		RetentionPeriodInDays: fwflex.Int32FromFramework(ctx, data.RetentionPeriodInDays),
+		RetentionPeriodInDays: fwflex.Int32FromFrameworkInt64(ctx, data.RetentionPeriodInDays),
 	}
 
 	output, err := conn.PutRetentionConfiguration(ctx, input)
@@ -115,7 +115,7 @@ func (r *retentionConfigurationResource) Read(ctx context.Context, request resou
 		return
 	}
 
-	data.RetentionPeriodInDays = fwflex.Int32ToFramework(ctx, retentionConfiguration.RetentionPeriodInDays)
+	data.RetentionPeriodInDays = fwflex.Int32ToFrameworkInt64(ctx, retentionConfiguration.RetentionPeriodInDays)
 
 	response.Diagnostics.Append(response.State.Set(ctx, &data)...)
 }
@@ -130,7 +130,7 @@ func (r *retentionConfigurationResource) Update(ctx context.Context, request res
 	conn := r.Meta().ConfigServiceClient(ctx)
 
 	input := &configservice.PutRetentionConfigurationInput{
-		RetentionPeriodInDays: fwflex.Int32FromFramework(ctx, new.RetentionPeriodInDays),
+		RetentionPeriodInDays: fwflex.Int32FromFrameworkInt64(ctx, new.RetentionPeriodInDays),
 	}
 
 	_, err := conn.PutRetentionConfiguration(ctx, input)

internal/service/ec2/vpc_security_group_ingress_rule.go

@@ -301,12 +301,12 @@ func (r *securityGroupRuleResource) Read(ctx context.Context, request resource.R
 	if v := aws.ToInt32(output.FromPort); v == -1 && data.FromPort.IsNull() {
 		data.FromPort = types.Int64Null()
 	} else {
-		data.FromPort = fwflex.Int32ToFramework(ctx, output.FromPort)
+		data.FromPort = fwflex.Int32ToFrameworkInt64(ctx, output.FromPort)
 	}
 	if v := aws.ToInt32(output.ToPort); v == -1 && data.ToPort.IsNull() {
 		data.ToPort = types.Int64Null()
 	} else {
-		data.ToPort = fwflex.Int32ToFramework(ctx, output.ToPort)
+		data.ToPort = fwflex.Int32ToFrameworkInt64(ctx, output.ToPort)
 	}
 
 	setTagsOut(ctx, output.Tags)
@@ -454,9 +454,9 @@ func (model *securityGroupRuleResourceModel) setID() {
 
 func (model *securityGroupRuleResourceModel) expandIPPermission(ctx context.Context) awstypes.IpPermission {
 	apiObject := awstypes.IpPermission{
-		FromPort:   fwflex.Int32FromFramework(ctx, model.FromPort),
+		FromPort:   fwflex.Int32FromFrameworkInt64(ctx, model.FromPort),
 		IpProtocol: fwflex.StringFromFramework(ctx, model.IPProtocol),
-		ToPort:     fwflex.Int32FromFramework(ctx, model.ToPort),
+		ToPort:     fwflex.Int32FromFrameworkInt64(ctx, model.ToPort),
 	}
 
 	if !model.CIDRIPv4.IsNull() {
@@ -502,11 +502,11 @@ func (model *securityGroupRuleResourceModel) expandSecurityGroupRuleRequest(ctx
 		CidrIpv4:          fwflex.StringFromFramework(ctx, model.CIDRIPv4),
 		CidrIpv6:          fwflex.StringFromFramework(ctx, model.CIDRIPv6),
 		Description:       fwflex.StringFromFramework(ctx, model.Description),
-		FromPort:          fwflex.Int32FromFramework(ctx, model.FromPort),
+		FromPort:          fwflex.Int32FromFrameworkInt64(ctx, model.FromPort),
 		IpProtocol:        fwflex.StringFromFramework(ctx, model.IPProtocol),
 		PrefixListId:      fwflex.StringFromFramework(ctx, model.PrefixListID),
 		ReferencedGroupId: fwflex.StringFromFramework(ctx, model.ReferencedSecurityGroupID),
-		ToPort:            fwflex.Int32FromFramework(ctx, model.ToPort),
+		ToPort:            fwflex.Int32FromFrameworkInt64(ctx, model.ToPort),
 	}
 
 	return apiObject

internal/service/ec2/vpc_security_group_rule_data_source.go

@@ -114,15 +114,15 @@ func (d *securityGroupRuleDataSource) Read(ctx context.Context, request datasour
 	data.CIDRIPv4 = flex.StringToFramework(ctx, output.CidrIpv4)
 	data.CIDRIPv6 = flex.StringToFramework(ctx, output.CidrIpv6)
 	data.Description = flex.StringToFramework(ctx, output.Description)
-	data.FromPort = flex.Int32ToFramework(ctx, output.FromPort)
+	data.FromPort = flex.Int32ToFrameworkInt64(ctx, output.FromPort)
 	data.IPProtocol = flex.StringToFramework(ctx, output.IpProtocol)
 	data.IsEgress = flex.BoolToFramework(ctx, output.IsEgress)
 	data.PrefixListID = flex.StringToFramework(ctx, output.PrefixListId)
 	data.ReferencedSecurityGroupID = flattenReferencedSecurityGroup(ctx, output.ReferencedGroupInfo, d.Meta().AccountID(ctx))
 	data.SecurityGroupID = flex.StringToFramework(ctx, output.GroupId)
 	data.SecurityGroupRuleID = flex.StringToFramework(ctx, output.SecurityGroupRuleId)
 	data.Tags = tftags.FlattenStringValueMap(ctx, keyValueTags(ctx, output.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map())
-	data.ToPort = flex.Int32ToFramework(ctx, output.ToPort)
+	data.ToPort = flex.Int32ToFrameworkInt64(ctx, output.ToPort)
 
 	response.Diagnostics.Append(response.State.Set(ctx, &data)...)
 }

internal/service/emr/supported_instance_types_data_source.go

@@ -156,10 +156,10 @@ func flattenSupportedInstanceTypes(ctx context.Context, apiObjects []awstypes.Su
 			"instance_family_id":       flex.StringToFramework(ctx, apiObject.InstanceFamilyId),
 			"is_64_bits_only":          flex.BoolToFramework(ctx, apiObject.Is64BitsOnly),
 			"memory_gb":                flex.Float32ToFramework(ctx, apiObject.MemoryGB),
-			"number_of_disks":          flex.Int32ToFramework(ctx, apiObject.NumberOfDisks),
-			"storage_gb":               flex.Int32ToFramework(ctx, apiObject.StorageGB),
+			"number_of_disks":          flex.Int32ToFrameworkInt64(ctx, apiObject.NumberOfDisks),
+			"storage_gb":               flex.Int32ToFrameworkInt64(ctx, apiObject.StorageGB),
 			names.AttrType:             flex.StringToFramework(ctx, apiObject.Type),
-			"vcpu":                     flex.Int32ToFramework(ctx, apiObject.VCPU),
+			"vcpu":                     flex.Int32ToFrameworkInt64(ctx, apiObject.VCPU),
 		}
 		objVal, d := types.ObjectValue(supportedInstanceTypeAttrTypes, obj)
 		diags.Append(d...)

internal/service/lexv2models/bot.go

@@ -242,7 +242,7 @@ func (r *resourceBot) Read(ctx context.Context, req resource.ReadRequest, resp *
 	state.Name = flex.StringToFramework(ctx, out.BotName)
 	state.Type = flex.StringValueToFramework(ctx, out.BotType)
 	state.Description = flex.StringToFramework(ctx, out.Description)
-	state.IdleSessionTTLInSeconds = flex.Int32ToFramework(ctx, out.IdleSessionTTLInSeconds)
+	state.IdleSessionTTLInSeconds = flex.Int32ToFrameworkInt64(ctx, out.IdleSessionTTLInSeconds)
 
 	members, errDiags := flattenMembers(ctx, out.BotMembers)
 	resp.Diagnostics.Append(errDiags...)
@@ -564,7 +564,7 @@ func (rd *resourceBotData) refreshFromOutput(ctx context.Context, out *lexmodels
 	rd.Name = flex.StringToFramework(ctx, out.BotName)
 	rd.Type = flex.StringToFramework(ctx, (*string)(&out.BotType))
 	rd.Description = flex.StringToFramework(ctx, out.Description)
-	rd.IdleSessionTTLInSeconds = flex.Int32ToFramework(ctx, out.IdleSessionTTLInSeconds)
+	rd.IdleSessionTTLInSeconds = flex.Int32ToFrameworkInt64(ctx, out.IdleSessionTTLInSeconds)
 
 	datap, d := flattenDataPrivacy(out.DataPrivacy)
 	diags.Append(d...)

internal/service/m2/application.go

@@ -186,7 +186,7 @@ func (r *applicationResource) Create(ctx context.Context, request resource.Creat
 	}
 
 	// Additional fields.
-	data.CurrentVersion = fwflex.Int32ToFramework(ctx, app.LatestVersion.ApplicationVersion)
+	data.CurrentVersion = fwflex.Int32ToFrameworkInt64(ctx, app.LatestVersion.ApplicationVersion)
 
 	response.Diagnostics.Append(response.State.Set(ctx, data)...)
 }
@@ -237,7 +237,7 @@ func (r *applicationResource) Read(ctx context.Context, request resource.ReadReq
 	}
 
 	// Additional fields.
-	data.CurrentVersion = fwflex.Int32ToFramework(ctx, outputGAV.ApplicationVersion)
+	data.CurrentVersion = fwflex.Int32ToFrameworkInt64(ctx, outputGAV.ApplicationVersion)
 	data.Definition = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &definitionModel{
 		Content:    fwflex.StringToFramework(ctx, outputGAV.DefinitionContent),
 		S3Location: types.StringNull(),
@@ -262,7 +262,7 @@ func (r *applicationResource) Update(ctx context.Context, request resource.Updat
 	if !new.Definition.Equal(old.Definition) || !new.Description.Equal(old.Description) {
 		input := &m2.UpdateApplicationInput{
 			ApplicationId:             fwflex.StringFromFramework(ctx, new.ID),
-			CurrentApplicationVersion: fwflex.Int32FromFramework(ctx, old.CurrentVersion),
+			CurrentApplicationVersion: fwflex.Int32FromFrameworkInt64(ctx, old.CurrentVersion),
 		}
 
 		if !new.Definition.Equal(old.Definition) {

internal/service/m2/environment.go

@@ -394,7 +394,7 @@ func (r *environmentResource) Update(ctx context.Context, request resource.Updat
 					return
 				}
 
-				input.DesiredCapacity = fwflex.Int32FromFramework(ctx, highAvailabilityConfigData.DesiredCapacity)
+				input.DesiredCapacity = fwflex.Int32FromFrameworkInt64(ctx, highAvailabilityConfigData.DesiredCapacity)
 			}
 			if !new.InstanceType.Equal(old.InstanceType) {
 				input.InstanceType = fwflex.StringFromFramework(ctx, new.InstanceType)

internal/service/memorydb/multi_region_cluster.go

@@ -200,7 +200,7 @@ func (r *multiRegionClusterResource) Create(ctx context.Context, req resource.Cr
 	}
 	// Account for field name mismatches between the Create
 	// and Describe data structures
-	plan.NumShards = flex.Int32ToFramework(ctx, statusOut.NumberOfShards)
+	plan.NumShards = flex.Int32ToFrameworkInt64(ctx, statusOut.NumberOfShards)
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, plan)...)
 }
@@ -236,7 +236,7 @@ func (r *multiRegionClusterResource) Read(ctx context.Context, req resource.Read
 		return
 	}
 	state.MultiRegionClusterNameSuffix = flex.StringToFramework(ctx, &suffix)
-	state.NumShards = flex.Int32ToFramework(ctx, out.NumberOfShards)
+	state.NumShards = flex.Int32ToFrameworkInt64(ctx, out.NumberOfShards)
 
 	resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...)
 	if resp.Diagnostics.HasError() {

internal/service/networkmonitor/probe.go

@@ -167,7 +167,7 @@ func (r *probeResource) Create(ctx context.Context, request resource.CreateReque
 	// Set values for unknowns.
 	data.AddressFamily = fwtypes.StringEnumValue(outputGP.AddressFamily)
 	if data.PacketSize.IsUnknown() {
-		data.PacketSize = fwflex.Int32ToFramework(ctx, outputGP.PacketSize)
+		data.PacketSize = fwflex.Int32ToFrameworkInt64(ctx, outputGP.PacketSize)
 	}
 	data.VpcID = fwflex.StringToFramework(ctx, outputGP.VpcId)
 
@@ -241,10 +241,10 @@ func (r *probeResource) Update(ctx context.Context, request resource.UpdateReque
 			input.Destination = fwflex.StringFromFramework(ctx, new.Destination)
 		}
 		if !new.DestinationPort.Equal(old.DestinationPort) {
-			input.DestinationPort = fwflex.Int32FromFramework(ctx, new.DestinationPort)
+			input.DestinationPort = fwflex.Int32FromFrameworkInt64(ctx, new.DestinationPort)
 		}
 		if !new.PacketSize.Equal(old.PacketSize) {
-			input.PacketSize = fwflex.Int32FromFramework(ctx, new.PacketSize)
+			input.PacketSize = fwflex.Int32FromFrameworkInt64(ctx, new.PacketSize)
 		}
 		if !new.Protocol.Equal(old.Protocol) {
 			input.Protocol = new.Protocol.ValueEnum()

internal/service/route53domains/domain.go

@@ -552,7 +552,7 @@ func (r *domainResource) Update(ctx context.Context, request resource.UpdateRequ
 			return
 		}
 
-		renewForYears := fwflex.Int32ValueFromFramework(ctx, new.DurationInYears) - fwflex.Int32ValueFromFramework(ctx, old.DurationInYears)
+		renewForYears := fwflex.Int32ValueFromFrameworkInt64(ctx, new.DurationInYears) - fwflex.Int32ValueFromFrameworkInt64(ctx, old.DurationInYears)
 
 		if err := renewDomain(ctx, conn, domainName, currentExpirationDate, renewForYears, r.UpdateTimeout(ctx, new.Timeouts)); err != nil {
 			response.Diagnostics.AddError("update", err.Error())

internal/service/s3/bucket_lifecycle_configuration.go

@@ -918,7 +918,7 @@ func (m lifecycleExpirationModel) Expand(ctx context.Context) (result any, diags
 	// For legacy-mode reasons, `days` may be zero, but should be treated as `nil`
 	days := fwflex.ZeroInt32AsNull(m.Days)
 
-	r.Days = fwflex.Int32FromFrameworkInt32(ctx, days)
+	r.Days = fwflex.Int32FromFramework(ctx, days)
 
 	if m.ExpiredObjectDeleteMarker.IsUnknown() || m.ExpiredObjectDeleteMarker.IsNull() {
 		if (m.Date.IsUnknown() || m.Date.IsNull()) && (days.IsUnknown() || days.IsNull()) {
@@ -972,7 +972,7 @@ func (m transitionModel) Expand(ctx context.Context) (result any, diags diag.Dia
 			r.Days = aws.Int32(0)
 		}
 	} else {
-		r.Days = fwflex.Int32FromFrameworkInt32(ctx, m.Days)
+		r.Days = fwflex.Int32FromFramework(ctx, m.Days)
 	}
 
 	r.StorageClass = m.StorageClass.ValueEnum()

internal/service/s3/bucket_lifecycle_configuration_migrate_v0.go

@@ -289,7 +289,7 @@ func upgradeAbortIncompleteMultipartStateFromV0(ctx context.Context, old fwtypes
 	newThings := make([]abortIncompleteMultipartUploadModel, len(oldThings))
 	for i, oldThing := range oldThings {
 		newThing := abortIncompleteMultipartUploadModel{
-			DaysAfterInitiation: types.Int32Value(fwflex.Int32ValueFromFramework(ctx, oldThing.DaysAfterInitiation)),
+			DaysAfterInitiation: types.Int32Value(fwflex.Int32ValueFromFrameworkInt64(ctx, oldThing.DaysAfterInitiation)),
 		}
 
 		newThings[i] = newThing