Skip to content

Commit ec8dd45

Browse files
chrismarget-jchrismarget-j
committed
introduce internal/numbers package
1 parent efe4c2a commit ec8dd45

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

‎apstra/resources/ipv4_pool.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/Juniper/apstra-go-sdk/apstra"
77
apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier"
8-
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
8+
"github.com/Juniper/terraform-provider-apstra/internal/numbers"
99
"github.com/Juniper/terraform-provider-apstra/internal/value"
1010
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
1111
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
@@ -132,8 +132,8 @@ func (o *Ipv4Pool) LoadApiData(ctx context.Context, in *apstra.IpPool, diags *di
132132
o.Name = types.StringValue(in.DisplayName)
133133
o.Status = types.StringValue(in.Status.String())
134134
o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage))
135-
o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used))
136-
o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total))
135+
o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used))
136+
o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total))
137137
o.Subnets = value.SetOrNull(ctx, types.ObjectType{AttrTypes: Ipv4PoolSubnet{}.AttrTypes()}, subnets, diags)
138138
}
139139

‎apstra/resources/ipv4_pool_subnet.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/Juniper/apstra-go-sdk/apstra"
77
apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier"
8-
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
98
apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator"
9+
"github.com/Juniper/terraform-provider-apstra/internal/numbers"
1010
"github.com/hashicorp/terraform-plugin-framework-nettypes/cidrtypes"
1111
"github.com/hashicorp/terraform-plugin-framework/attr"
1212
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -96,8 +96,8 @@ func (o Ipv4PoolSubnet) AttrTypes() map[string]attr.Type {
9696
func (o *Ipv4PoolSubnet) LoadApiData(_ context.Context, in *apstra.IpSubnet, _ *diag.Diagnostics) {
9797
o.Status = types.StringValue(in.Status)
9898
o.Network = cidrtypes.NewIPv4PrefixValue(in.Network.String())
99-
o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total))
100-
o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used))
99+
o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total))
100+
o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used))
101101
o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage))
102102
}
103103

‎apstra/resources/ipv6_pool.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier"
88
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
99
"github.com/Juniper/terraform-provider-apstra/internal/value"
10+
"github.com/Juniper/terraform-provider-apstra/internal/numbers"
1011
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
1112
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
1213
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -132,8 +133,8 @@ func (o *Ipv6Pool) LoadApiData(ctx context.Context, in *apstra.IpPool, diags *di
132133
o.Name = types.StringValue(in.DisplayName)
133134
o.Status = types.StringValue(in.Status.String())
134135
o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage))
135-
o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used))
136-
o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total))
136+
o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used))
137+
o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total))
137138
o.Subnets = value.SetOrNull(ctx, types.ObjectType{AttrTypes: Ipv6PoolSubnet{}.AttrTypes()}, subnets, diags)
138139
}
139140

‎apstra/resources/ipv6_pool_subnet.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/Juniper/apstra-go-sdk/apstra"
77
apstraplanmodifier "github.com/Juniper/terraform-provider-apstra/apstra/plan_modifier"
8-
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
98
apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator"
9+
"github.com/Juniper/terraform-provider-apstra/internal/numbers"
1010
"github.com/hashicorp/terraform-plugin-framework-nettypes/cidrtypes"
1111
"github.com/hashicorp/terraform-plugin-framework/attr"
1212
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -96,8 +96,8 @@ func (o Ipv6PoolSubnet) AttrTypes() map[string]attr.Type {
9696
func (o *Ipv6PoolSubnet) LoadApiData(_ context.Context, in *apstra.IpSubnet, _ *diag.Diagnostics) {
9797
o.Status = types.StringValue(in.Status)
9898
o.Network = cidrtypes.NewIPv6PrefixValue(in.Network.String())
99-
o.Total = types.NumberValue(utils.BigIntToBigFloat(&in.Total))
100-
o.Used = types.NumberValue(utils.BigIntToBigFloat(&in.Used))
99+
o.Total = types.NumberValue(numbers.BigIntToBigFloat(&in.Total))
100+
o.Used = types.NumberValue(numbers.BigIntToBigFloat(&in.Used))
101101
o.UsedPercentage = types.Float64Value(float64(in.UsedPercentage))
102102
}
103103

‎apstra/utils/numbers.go‎ renamed to ‎internal/numbers/big.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils
1+
package numbers
22

33
import "math/big"
44

0 commit comments

Comments
 (0)