fix(rdb): integrate PN provisioning_mode to remove dependency with IPAM (scaleway#2572)

* fix(rdb): integrate PN provisioning_mode to remove dependency with IPAM

* record ipam rdb cassette

Author: Mia-Cross

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.5.6
 	github.com/nats-io/nats.go v1.34.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240416090022-eaa650293b32
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240503144623-358f61d22470
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.22.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -246,8 +246,8 @@ github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXq
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240416090022-eaa650293b32 h1:VaTPo4ij4NRWcRRtxpYo+JlB3nwgAjIIUAePKVU2zaI=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240416090022-eaa650293b32/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240503144623-358f61d22470 h1:jOsaUs0Mpg/2UCEcB/z3YpyG1UtgsjOPSKCRaOdMntg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26.0.20240503144623-358f61d22470/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=

internal/services/ipam/testdata/data-source-ipamiprdb.cassette.yaml

@@ -3,13 +3,11 @@ package rdb
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strings"
 	"time"
 
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
@@ -102,46 +100,3 @@ func getIPConfigUpdate(d *schema.ResourceData, ipFieldName string) (ipamConfig *
 	}
 	return ipamConfig, staticConfig
 }
-
-func getIPAMConfigRead(resource interface{}, m interface{}) (bool, error) {
-	ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m))
-	request := &ipam.ListIPsRequest{
-		ResourceType: "rdb_instance",
-		IsIPv6:       scw.BoolPtr(false),
-	}
-	var privateEndpoint *rdb.EndpointPrivateNetworkDetails
-
-	switch res := resource.(type) {
-	case *rdb.Instance:
-		request.Region = res.Region
-		request.ResourceID = &res.ID
-		for _, e := range res.Endpoints {
-			if e.PrivateNetwork != nil {
-				privateEndpoint = e.PrivateNetwork
-			}
-		}
-	case *rdb.ReadReplica:
-		request.Region = res.Region
-		request.ResourceID = &res.InstanceID
-		for _, e := range res.Endpoints {
-			if e.PrivateNetwork != nil {
-				privateEndpoint = e.PrivateNetwork
-			}
-		}
-	}
-	if privateEndpoint == nil {
-		return false, nil
-	}
-
-	ips, err := ipamAPI.ListIPs(request, scw.WithAllPages())
-	if err != nil {
-		return false, fmt.Errorf("could not list IPs: %w", err)
-	}
-
-	for _, ip := range ips.IPs {
-		if ip.Address.String() == privateEndpoint.ServiceIP.String() {
-			return true, nil
-		}
-	}
-	return false, nil
-}

internal/services/rdb/helpers.go

@@ -511,11 +511,7 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte
 	_ = d.Set("logs_policy", flattenInstanceLogsPolicy(res.LogsPolicy))
 
 	// set endpoints
-	enableIpam, err := getIPAMConfigRead(res, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	if pnI, pnExist := flattenPrivateNetwork(res.Endpoints, enableIpam); pnExist {
+	if pnI, pnExist := flattenPrivateNetwork(res.Endpoints); pnExist {
 		_ = d.Set("private_network", pnI)
 	}
 	if lbI, lbExists := flattenLoadBalancer(res.Endpoints); lbExists {

internal/services/rdb/instance.go

@@ -167,7 +167,7 @@ func ResourceRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	ipamConfig, staticConfig := getIPConfigCreate(d, "service_ip")
-	if pn, diags := expandReadReplicaEndpointsSpecPrivateNetwork(d.Get("private_network"), ipamConfig, staticConfig); err != nil || pn != nil {
+	if pn, diags := expandReadReplicaEndpointsSpecPrivateNetwork(d.Get("private_network"), ipamConfig, staticConfig); len(diags) > 0 || pn != nil {
 		if diags.HasError() {
 			return diags
 		}
@@ -212,11 +212,7 @@ func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 
-	enableIpam, err := getIPAMConfigRead(rr, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	directAccess, privateNetwork := flattenReadReplicaEndpoints(rr.Endpoints, enableIpam)
+	directAccess, privateNetwork := flattenReadReplicaEndpoints(rr.Endpoints)
 	_ = d.Set("direct_access", directAccess)
 	_ = d.Set("private_network", privateNetwork)