Skip to content

Commit 278ff5c

Browse files
authored
tests(vpc): fix postgres version (scaleway#4365)
1 parent a155e2f commit 278ff5c

File tree

6 files changed

+5598
-2564
lines changed

6 files changed

+5598
-2564
lines changed

internal/namespaces/vpc/v2/custom_private_network_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func Test_GetPrivateNetwork(t *testing.T) {
4141
createNIC(),
4242
createLB(),
4343
attachLB(),
44-
createRdbInstance(),
44+
createRdbInstance("RDB", "PostgreSQL"),
4545
),
4646
Cmd: "scw vpc private-network get {{ .PN.ID }}",
4747
Check: core.TestCheckGolden(),

internal/namespaces/vpc/v2/helper_test.go

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package vpc_test
22

33
import (
4+
"fmt"
5+
46
"github.com/scaleway/scaleway-cli/v2/core"
7+
rdbAPI "github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
58
)
69

710
func createInstance() core.BeforeFunc {
@@ -56,11 +59,20 @@ func deleteLB() core.AfterFunc {
5659
return core.ExecAfterCmd("scw lb lb delete {{ .LB.ID }}")
5760
}
5861

59-
func createRdbInstance() core.BeforeFunc {
60-
return core.ExecStoreBeforeCmd(
61-
"RDB",
62-
"scw rdb instance create node-type=DB-DEV-S is-ha-cluster=false name=cli-test engine=PostgreSQL-12 user-name=foobar password={4xdl*#QOoP+&3XRkGA)] init-endpoints.0.private-network.private-network-id={{ .PN.ID }} init-endpoints.0.private-network.service-ip=192.168.0.1/24 --wait",
63-
)
62+
func createRdbInstance(metaKey, engineName string) core.BeforeFunc {
63+
return func(ctx *core.BeforeFuncCtx) error {
64+
api := rdbAPI.NewAPI(ctx.Client)
65+
engine, err := api.FetchLatestEngineVersion(engineName)
66+
if err != nil {
67+
return err
68+
}
69+
cmd := fmt.Sprintf(
70+
"scw rdb instance create node-type=DB-DEV-S is-ha-cluster=false name=cli-test engine=%s user-name=foobar password={4xdl*#QOoP+&3XRkGA)] init-endpoints.0.private-network.private-network-id={{ .PN.ID }} init-endpoints.0.private-network.service-ip=192.168.0.1/24 --wait",
71+
engine.Name,
72+
)
73+
74+
return core.ExecStoreBeforeCmd(metaKey, cmd)(ctx)
75+
}
6476
}
6577

6678
func detachRdbInstance() core.AfterFunc {

0 commit comments

Comments
 (0)