refactor

Author: yfodil

internal/dsf/ip.go

@@ -0,0 +1,22 @@
+package dsf
+
+import (
+	"net"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func DiffSuppressFuncStandaloneIPandCIDR(_, oldValue, newValue string, _ *schema.ResourceData) bool {
+	parseIPOrCIDR := func(s string) net.IP {
+		if ip, _, err := net.ParseCIDR(s); err == nil {
+			return ip
+		}
+
+		return net.ParseIP(s)
+	}
+
+	oldIP := parseIPOrCIDR(oldValue)
+	newIP := parseIPOrCIDR(newValue)
+
+	return oldIP != nil && newIP != nil && oldIP.Equal(newIP)
+}

internal/services/ipam/helpers_test.go renamed to internal/dsf/ip_test.go

@@ -1,9 +1,9 @@
-package ipam_test
+package dsf_test
 
 import (
 	"testing"
 
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 )
 
 func TestDiffSuppress_IPAMIP(t *testing.T) {
@@ -77,7 +77,7 @@ func TestDiffSuppress_IPAMIP(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := ipam.DiffSuppressFuncStandaloneIPandCIDR("", tt.oldValue, tt.newValue, nil)
+			got := dsf.DiffSuppressFuncStandaloneIPandCIDR("", tt.oldValue, tt.newValue, nil)
 			if got != tt.want {
 				t.Fatalf("diffSuppress(%q, %q) = %v, want %v", tt.oldValue, tt.newValue, got, tt.want)
 			}

internal/services/ipam/helpers.go

@@ -3,7 +3,6 @@ package ipam
 import (
 	"context"
 	"fmt"
-	"net"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -43,21 +42,6 @@ func NewAPIWithRegionAndID(m any, id string) (*ipam.API, scw.Region, string, err
 	return ipamAPI, region, ID, err
 }
 
-func DiffSuppressFuncStandaloneIPandCIDR(_, oldValue, newValue string, _ *schema.ResourceData) bool {
-	parseIPOrCIDR := func(s string) net.IP {
-		if ip, _, err := net.ParseCIDR(s); err == nil {
-			return ip
-		}
-
-		return net.ParseIP(s)
-	}
-
-	oldIP := parseIPOrCIDR(oldValue)
-	newIP := parseIPOrCIDR(newValue)
-
-	return oldIP != nil && newIP != nil && oldIP.Equal(newIP)
-}
-
 type GetResourcePrivateIPsOptions struct {
 	ResourceType     *ipam.ResourceType
 	ResourceID       *string

internal/services/ipam/ip.go

@@ -38,7 +38,7 @@ func ResourceIP() *schema.Resource {
 				ForceNew:         true,
 				Description:      "Request a specific IP in the requested source pool",
 				ValidateFunc:     validation.IsIPAddress,
-				DiffSuppressFunc: DiffSuppressFuncStandaloneIPandCIDR,
+				DiffSuppressFunc: dsf.DiffSuppressFuncStandaloneIPandCIDR,
 			},
 			"source": {
 				Type:        schema.TypeList,