diff --git a/apstra/resources/ipv4_pool.go b/apstra/resources/ipv4_pool.go index 49a4cc5f..05a92758 100644 --- a/apstra/resources/ipv4_pool.go +++ b/apstra/resources/ipv4_pool.go @@ -5,7 +5,7 @@ import ( "github.com/Juniper/apstra-go-sdk/apstra" apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier" - "github.com/Juniper/terraform-provider-apstra/apstra/utils" + "github.com/Juniper/terraform-provider-apstra/internal/numbers" "github.com/Juniper/terraform-provider-apstra/internal/value" "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" @@ -132,8 +132,8 @@ func (o *Ipv4Pool) LoadApiData(ctx context.Context, in *apstra.IpPool, diags *di o.Name = types.StringValue(in.DisplayName) o.Status = types.StringValue(in.Status.String()) o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage)) - o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used)) - o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total)) + o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used)) + o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total)) o.Subnets = value.SetOrNull(ctx, types.ObjectType{AttrTypes: Ipv4PoolSubnet{}.AttrTypes()}, subnets, diags) } diff --git a/apstra/resources/ipv4_pool_subnet.go b/apstra/resources/ipv4_pool_subnet.go index f16d5d13..0de5080c 100644 --- a/apstra/resources/ipv4_pool_subnet.go +++ b/apstra/resources/ipv4_pool_subnet.go @@ -5,8 +5,8 @@ import ( "github.com/Juniper/apstra-go-sdk/apstra" apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier" - "github.com/Juniper/terraform-provider-apstra/apstra/utils" apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator" + "github.com/Juniper/terraform-provider-apstra/internal/numbers" "github.com/hashicorp/terraform-plugin-framework-nettypes/cidrtypes" "github.com/hashicorp/terraform-plugin-framework/attr" dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema" @@ -96,8 +96,8 @@ func (o Ipv4PoolSubnet) AttrTypes() map[string]attr.Type { func (o *Ipv4PoolSubnet) LoadApiData(_ context.Context, in *apstra.IpSubnet, _ *diag.Diagnostics) { o.Status = types.StringValue(in.Status) o.Network = cidrtypes.NewIPv4PrefixValue(in.Network.String()) - o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total)) - o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used)) + o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total)) + o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used)) o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage)) } diff --git a/apstra/resources/ipv6_pool.go b/apstra/resources/ipv6_pool.go index 76757618..ba0588b7 100644 --- a/apstra/resources/ipv6_pool.go +++ b/apstra/resources/ipv6_pool.go @@ -5,7 +5,7 @@ import ( "github.com/Juniper/apstra-go-sdk/apstra" apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier" - "github.com/Juniper/terraform-provider-apstra/apstra/utils" + "github.com/Juniper/terraform-provider-apstra/internal/numbers" "github.com/Juniper/terraform-provider-apstra/internal/value" "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" @@ -132,8 +132,8 @@ func (o *Ipv6Pool) LoadApiData(ctx context.Context, in *apstra.IpPool, diags *di o.Name = types.StringValue(in.DisplayName) o.Status = types.StringValue(in.Status.String()) o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage)) - o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used)) - o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total)) + o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used)) + o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total)) o.Subnets = value.SetOrNull(ctx, types.ObjectType{AttrTypes: Ipv6PoolSubnet{}.AttrTypes()}, subnets, diags) } diff --git a/apstra/resources/ipv6_pool_subnet.go b/apstra/resources/ipv6_pool_subnet.go index 4a5add42..0cbbe11b 100644 --- a/apstra/resources/ipv6_pool_subnet.go +++ b/apstra/resources/ipv6_pool_subnet.go @@ -5,8 +5,8 @@ import ( "github.com/Juniper/apstra-go-sdk/apstra" apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier" - "github.com/Juniper/terraform-provider-apstra/apstra/utils" apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator" + "github.com/Juniper/terraform-provider-apstra/internal/numbers" "github.com/hashicorp/terraform-plugin-framework-nettypes/cidrtypes" "github.com/hashicorp/terraform-plugin-framework/attr" dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema" @@ -96,8 +96,8 @@ func (o Ipv6PoolSubnet) AttrTypes() map[string]attr.Type { func (o *Ipv6PoolSubnet) LoadApiData(_ context.Context, in *apstra.IpSubnet, _ *diag.Diagnostics) { o.Status = types.StringValue(in.Status) o.Network = cidrtypes.NewIPv6PrefixValue(in.Network.String()) - o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total)) - o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used)) + o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total)) + o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used)) o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage)) } diff --git a/apstra/utils/numbers.go b/internal/numbers/big.go similarity index 89% rename from apstra/utils/numbers.go rename to internal/numbers/big.go index 9e50a1cb..27fff6c4 100644 --- a/apstra/utils/numbers.go +++ b/internal/numbers/big.go @@ -1,4 +1,4 @@ -package utils +package numbers import "math/big"