Skip to content

Commit

Permalink
chore: user lower case acronym for non exported ip functions
Browse files Browse the repository at this point in the history
  • Loading branch information
alrayyes committed Dec 2, 2024
1 parent 9e95805 commit e56696a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion internal/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@ func (p *leasewebProvider) Resources(_ context.Context) []func() resource.Resour
publiccloud.NewLoadBalancerResource,
publiccloud.NewLoadBalancerListenerResource,
publiccloud.NewTargetGroupResource,
publiccloud.NewIpResource,
publiccloud.NewIPResource,
}
}
6 changes: 3 additions & 3 deletions internal/provider/publiccloud/instance_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (i instanceResourceModel) AttributeTypes() map[string]attr.Type {
"root_disk_storage_type": types.StringType,
"ips": types.ListType{
ElemType: types.ObjectType{
AttrTypes: iPResourceModel{}.AttributeTypes(),
AttrTypes: ipResourceModel{}.AttributeTypes(),
},
},
"contract": types.ObjectType{
Expand Down Expand Up @@ -256,7 +256,7 @@ func adaptInstanceToInstanceResource(

ips, err := utils.AdaptSdkModelsToListValue(
sdkInstance.Ips,
iPResourceModel{}.AttributeTypes(),
ipResourceModel{}.AttributeTypes(),
ctx,
adaptIpToIPResource,
)
Expand Down Expand Up @@ -307,7 +307,7 @@ func adaptInstanceDetailsToInstanceResource(

ips, err := utils.AdaptSdkModelsToListValue(
sdkInstanceDetails.Ips,
iPResourceModel{}.AttributeTypes(),
ipResourceModel{}.AttributeTypes(),
ctx,
adaptIpDetailsToIPResource,
)
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/publiccloud/instance_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func Test_adaptInstanceToInstanceResource(t *testing.T) {
got.Contract.As(context.TODO(), &contract, basetypes.ObjectAsOptions{})
assert.Equal(t, "MONTHLY", contract.Type.ValueString())

var ips []iPResourceModel
var ips []ipResourceModel
got.IPs.ElementsAs(context.TODO(), &ips, false)
assert.Len(t, ips, 1)
assert.Equal(t, "127.0.0.1", ips[0].IP.ValueString())
Expand Down Expand Up @@ -196,7 +196,7 @@ func Test_adaptInstanceDetailsToInstanceResource(t *testing.T) {
got.Contract.As(context.TODO(), &contract, basetypes.ObjectAsOptions{})
assert.Equal(t, "MONTHLY", contract.Type.ValueString())

var ips []iPResourceModel
var ips []ipResourceModel
got.IPs.ElementsAs(context.TODO(), &ips, false)
assert.Len(t, ips, 1)
assert.Equal(t, "127.0.0.1", ips[0].IP.ValueString())
Expand Down
20 changes: 10 additions & 10 deletions internal/provider/publiccloud/ip_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ var (
_ resource.ResourceWithImportState = &ipResource{}
)

type iPResourceModel struct {
type ipResourceModel struct {
ReverseLookup types.String `tfsdk:"reverse_lookup"`
InstanceID types.String `tfsdk:"instance_id"`
IP types.String `tfsdk:"ip"`
}

func (i iPResourceModel) AttributeTypes() map[string]attr.Type {
func (i ipResourceModel) AttributeTypes() map[string]attr.Type {
return map[string]attr.Type{
"reverse_lookup": types.StringType,
"instance_id": types.StringType,
"ip": types.StringType,
}
}

func (i iPResourceModel) generateUpdateOpts() publiccloud.UpdateIpOpts {
func (i ipResourceModel) generateUpdateOpts() publiccloud.UpdateIpOpts {
return *publiccloud.NewUpdateIpOpts(i.ReverseLookup.ValueString())
}

Expand All @@ -44,17 +44,17 @@ type ipResource struct {
client publiccloud.PubliccloudAPI
}

func adaptIpDetailsToIPResource(sdkIpDetails publiccloud.IpDetails) iPResourceModel {
func adaptIpDetailsToIPResource(sdkIpDetails publiccloud.IpDetails) ipResourceModel {
reverseLookup, _ := sdkIpDetails.GetReverseLookupOk()
return iPResourceModel{
return ipResourceModel{
ReverseLookup: basetypes.NewStringPointerValue(reverseLookup),
IP: basetypes.NewStringValue(sdkIpDetails.GetIp()),
}
}

func adaptIpToIPResource(sdkIp publiccloud.Ip) iPResourceModel {
func adaptIpToIPResource(sdkIp publiccloud.Ip) ipResourceModel {
reverseLookup, _ := sdkIp.GetReverseLookupOk()
return iPResourceModel{
return ipResourceModel{
ReverseLookup: basetypes.NewStringPointerValue(reverseLookup),
IP: basetypes.NewStringValue(sdkIp.GetIp()),
}
Expand Down Expand Up @@ -145,7 +145,7 @@ func (i *ipResource) Read(
request resource.ReadRequest,
response *resource.ReadResponse,
) {
var state iPResourceModel
var state ipResourceModel
response.Diagnostics.Append(request.State.Get(ctx, &state)...)
if response.Diagnostics.HasError() {
return
Expand Down Expand Up @@ -183,7 +183,7 @@ func (i *ipResource) Update(
request resource.UpdateRequest,
response *resource.UpdateResponse,
) {
var plan iPResourceModel
var plan ipResourceModel
response.Diagnostics.Append(request.Plan.Get(ctx, &plan)...)
if response.Diagnostics.HasError() {
return
Expand Down Expand Up @@ -253,7 +253,7 @@ func (i *ipResource) Configure(
i.client = coreClient.PubliccloudAPI
}

func NewIpResource() resource.Resource {
func NewIPResource() resource.Resource {
return &ipResource{
name: "public_cloud_ip",
}
Expand Down
12 changes: 6 additions & 6 deletions internal/provider/publiccloud/ip_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Test_adaptIpToIPResource(t *testing.T) {
ReverseLookup: *publiccloud.NewNullableString(&reverseLookup),
}

want := iPResourceModel{
want := ipResourceModel{
IP: basetypes.NewStringValue("127.0.0.1"),
ReverseLookup: basetypes.NewStringPointerValue(&reverseLookup),
}
Expand All @@ -31,7 +31,7 @@ func Test_adaptIpToIPResource(t *testing.T) {
ReverseLookup: *publiccloud.NewNullableString(nil),
}

want := iPResourceModel{
want := ipResourceModel{
IP: basetypes.NewStringValue("127.0.0.1"),
ReverseLookup: basetypes.NewStringPointerValue(nil),
}
Expand All @@ -49,7 +49,7 @@ func Test_adaptIpDetailsToIPResource(t *testing.T) {
ReverseLookup: *publiccloud.NewNullableString(&reverseLookup),
}

want := iPResourceModel{
want := ipResourceModel{
IP: basetypes.NewStringValue("127.0.0.1"),
ReverseLookup: basetypes.NewStringPointerValue(&reverseLookup),
}
Expand All @@ -64,7 +64,7 @@ func Test_adaptIpDetailsToIPResource(t *testing.T) {
ReverseLookup: *publiccloud.NewNullableString(nil),
}

want := iPResourceModel{
want := ipResourceModel{
IP: basetypes.NewStringValue("127.0.0.1"),
ReverseLookup: basetypes.NewStringPointerValue(nil),
}
Expand All @@ -77,7 +77,7 @@ func Test_adaptIpDetailsToIPResource(t *testing.T) {
func Test_iPResourceModel_generateUpdateOpts(t *testing.T) {
t.Run("is set properly when reverseLookup is set", func(t *testing.T) {
reverseLookup := "example.com"
ip := iPResourceModel{
ip := ipResourceModel{
ReverseLookup: basetypes.NewStringPointerValue(&reverseLookup),
}
got := ip.generateUpdateOpts()
Expand All @@ -90,7 +90,7 @@ func Test_iPResourceModel_generateUpdateOpts(t *testing.T) {
})

t.Run("is set properly when reverseLookup is not set", func(t *testing.T) {
ip := iPResourceModel{
ip := ipResourceModel{
ReverseLookup: basetypes.NewStringPointerValue(nil),
}
got := ip.generateUpdateOpts()
Expand Down

0 comments on commit e56696a

Please sign in to comment.