Skip to content

fix: migrate to vpc/v2 #4281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 20, 2024
Merged

fix: migrate to vpc/v2 #4281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59ba6c2
fix: migrate to vpc/v2
remyleone Nov 19, 2024
1890b7e
Fix
remyleone Nov 20, 2024
ba54cf9
Merge branch 'master' into fix_vpc_v1
remyleone Nov 20, 2024
9137acd
Fix
remyleone Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions internal/namespaces/instance/v1/custom_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions internal/namespaces/rdb/v1/custom_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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 }}",
Expand All @@ -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 }}",
Expand All @@ -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(),
Expand Down
4 changes: 2 additions & 2 deletions internal/namespaces/rdb/v1/custom_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions internal/namespaces/rdb/v1/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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),
Expand All @@ -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
}
Expand Down
Loading
Loading