fix: migrate to vpc/v2 (scaleway#4281)

Author: remyleone

internal/namespaces/instance/v1/custom_server.go

@@ -18,7 +18,7 @@ import (
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
-	"github.com/scaleway/scaleway-sdk-go/api/vpc/v1"
+	"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
 	"github.com/scaleway/scaleway-sdk-go/logger"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/scaleway-sdk-go/validation"
@@ -366,9 +366,13 @@ func serverGetBuilder(c *core.Command) *core.Command {
 		nics := []customNICs{}
 
 		for _, nic := range getServerResp.Server.PrivateNics {
+			region, err := getServerResp.Server.Zone.Region()
+			if err != nil {
+				return nil, err
+			}
 			pn, err := vpcAPI.GetPrivateNetwork(&vpc.GetPrivateNetworkRequest{
 				PrivateNetworkID: nic.PrivateNetworkID,
-				Zone:             getServerResp.Server.Zone,
+				Region:           region,
 			})
 			if err != nil {
 				return nil, err

internal/namespaces/rdb/v1/custom_endpoint_test.go

@@ -19,7 +19,7 @@ func Test_EndpointCreate(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetwork("PostgreSQL-15"),
+			createInstanceWithPrivateNetwork(),
 		),
 		Cmd: "scw rdb endpoint create {{ .Instance.ID }} load-balancer=true --wait",
 		Check: core.TestCheckCombine(
@@ -84,7 +84,7 @@ func Test_EndpointDelete(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-15"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 			listEndpointsInMeta(),
 		),
 		Cmd: "scw rdb endpoint delete {{ .PublicEndpoint.ID }} instance-id={{ .Instance.ID }} --wait",
@@ -106,7 +106,7 @@ func Test_EndpointDelete(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-15"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 			listEndpointsInMeta(),
 		),
 		Cmd: "scw rdb endpoint delete {{ .PrivateEndpoint.ID }} instance-id={{ .Instance.ID }} --wait",
@@ -153,7 +153,7 @@ func Test_EndpointGet(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-15"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 			listEndpointsInMeta(),
 		),
 		Cmd: "scw rdb endpoint get {{ .PublicEndpoint.ID }}",
@@ -175,7 +175,7 @@ func Test_EndpointGet(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-15"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 			listEndpointsInMeta(),
 		),
 		Cmd: "scw rdb endpoint get {{ .PrivateEndpoint.ID }}",
@@ -202,7 +202,7 @@ func Test_EndpointList(t *testing.T) {
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-15"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 		),
 		Cmd:   "scw rdb endpoint list {{ .Instance.ID }}",
 		Check: core.TestCheckGolden(),

internal/namespaces/rdb/v1/custom_instance_test.go

@@ -287,7 +287,7 @@ func Test_Connect(t *testing.T) {
 		Commands: rdb.GetCommands(),
 		BeforeFunc: core.BeforeFuncCombine(
 			core.BeforeFuncStoreInMeta("username", user),
-			createInstance("PostgreSQL-12"),
+			createInstance("PostgreSQL-15"),
 		),
 		Cmd: "scw rdb instance connect {{ .Instance.ID }} username={{ .username }}",
 		Check: core.TestCheckCombine(
@@ -302,7 +302,7 @@ func Test_Connect(t *testing.T) {
 		BeforeFunc: core.BeforeFuncCombine(
 			core.BeforeFuncStoreInMeta("username", user),
 			createPN(),
-			createInstanceWithPrivateNetworkAndLoadBalancer("PostgreSQL-14"),
+			createInstanceWithPrivateNetworkAndLoadBalancer(),
 		),
 		Cmd: "scw rdb instance connect {{ .Instance.ID }} username={{ .username }}",
 		Check: core.TestCheckCombine(

internal/namespaces/rdb/v1/helper_test.go

@@ -6,15 +6,15 @@ import (
 
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
-	"github.com/scaleway/scaleway-sdk-go/api/vpc/v1"
+	"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 const (
 	name     = "cli-test"
 	user     = "foobar"
 	password = "{4xdl*#QOoP+&3XRkGA)]"
-	engine   = "PostgreSQL-12"
+	engine   = "PostgreSQL-15"
 )
 
 func createInstance(engine string) core.BeforeFunc {
@@ -24,14 +24,14 @@ func createInstance(engine string) core.BeforeFunc {
 	)
 }
 
-func createInstanceWithPrivateNetwork(engine string) core.BeforeFunc {
+func createInstanceWithPrivateNetwork() core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
 		"Instance",
 		fmt.Sprintf(baseCommand+privateNetworkStaticSpec, name, engine, user, password),
 	)
 }
 
-func createInstanceWithPrivateNetworkAndLoadBalancer(engine string) core.BeforeFunc {
+func createInstanceWithPrivateNetworkAndLoadBalancer() core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
 		"Instance",
 		fmt.Sprintf(baseCommand+privateNetworkStaticSpec+loadBalancerSpec, name, engine, user, password),
@@ -47,7 +47,7 @@ func createPN() core.BeforeFunc {
 		}
 		ctx.Meta["PN"] = pn
 		if len(pn.Subnets) > 0 {
-			ctx.Meta["IPNet"], err = getIPSubnet(pn.Subnets[0])
+			ctx.Meta["IPNet"], err = getIPSubnet(pn.Subnets[0].Subnet)
 			if err != nil {
 				return err
 			}