Skip to content

test(baremetal): manage error getOffer and refacto #5214

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

Draft
Laure-di wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

test(baremetal): manage error getOffer and refacto #5214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 12 additions & 47 deletions internal/namespaces/baremetal/v1/custom_server_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package baremetal_test

import (
"errors"
"testing"

"github.com/scaleway/scaleway-cli/v2/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/stretchr/testify/assert"
)

Expand All @@ -22,45 +20,23 @@ func Test_CreateServer(t *testing.T) {
// Simple use cases
t.Run("Simple", func(t *testing.T) {
t.Run("Default", core.Test(&core.TestConfig{
Commands: baremetal.GetCommands(),
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
Cmd: "scw baremetal server create zone=" + zone + " type=" + offerNameNVME + " -w",
Commands: baremetal.GetCommands(),
BeforeFunc: checkStockOffer(),
Cmd: "scw baremetal server create zone=" + zone + " type=" + offerNameNVME + " -w",
Check: core.TestCheckCombine(
core.TestCheckGolden(),
core.TestCheckExitCode(0),
),
AfterFunc: core.ExecAfterCmd(
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone,
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone + " -w",
),
},
))

t.Run("With name", core.Test(&core.TestConfig{
Commands: baremetal.GetCommands(),
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
Cmd: "scw baremetal server create name=test-create-server-with-name zone=" + zone + " type=" + offerNameNVME + " -w",
Commands: baremetal.GetCommands(),
BeforeFunc: checkStockOffer(),
Cmd: "scw baremetal server create name=test-create-server-with-name zone=" + zone + " type=" + offerNameNVME + " -w",
Check: core.TestCheckCombine(
func(t *testing.T, ctx *core.CheckFuncCtx) {
t.Helper()
Expand All @@ -73,25 +49,14 @@ func Test_CreateServer(t *testing.T) {
core.TestCheckExitCode(0),
),
AfterFunc: core.ExecAfterCmd(
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone,
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone + " -w",
),
}))

t.Run("Tags", core.Test(&core.TestConfig{
Commands: baremetal.GetCommands(),
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
Cmd: "scw baremetal server create tags.0=prod tags.1=blue zone=" + zone + " type=" + offerNameNVME + " -w",
Commands: baremetal.GetCommands(),
BeforeFunc: checkStockOffer(),
Cmd: "scw baremetal server create tags.0=prod tags.1=blue zone=" + zone + " type=" + offerNameNVME + " -w",
Check: core.TestCheckCombine(
func(t *testing.T, ctx *core.CheckFuncCtx) {
t.Helper()
Expand All @@ -101,7 +66,7 @@ func Test_CreateServer(t *testing.T) {
core.TestCheckExitCode(0),
),
AfterFunc: core.ExecAfterCmd(
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone,
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone + " -w",
),
}))
})
Expand Down
29 changes: 2 additions & 27 deletions internal/namespaces/baremetal/v1/custom_server_fip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package baremetal_test

import (
"errors"
"testing"

"github.com/scaleway/scaleway-cli/v2/core"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
flexibleip "github.com/scaleway/scaleway-cli/v2/internal/namespaces/flexibleip/v1alpha1"
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func Test_CreateFlexibleIPInteractive(t *testing.T) {
Expand All @@ -22,18 +19,7 @@ func Test_CreateFlexibleIPInteractive(t *testing.T) {
t.Run("Simple Interactive", core.Test(&core.TestConfig{
Commands: cmds,
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
createServerAndWait(),
),
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }} zone=" + zone,
Expand All @@ -55,18 +41,7 @@ func Test_CreateFlexibleIP(t *testing.T) {
t.Run("Simple", core.Test(&core.TestConfig{
Commands: cmds,
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
createServerAndWait(),
),
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }} ip-type=IPv4 zone=" + zone,
Expand Down
31 changes: 2 additions & 29 deletions internal/namespaces/baremetal/v1/custom_server_install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package baremetal_test

import (
"errors"
"testing"

"github.com/scaleway/scaleway-cli/v2/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func Test_InstallServer(t *testing.T) {
Expand All @@ -22,20 +19,7 @@ func Test_InstallServer(t *testing.T) {

t.Run("With ID", core.Test(&core.TestConfig{
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
err := errors.New("offer out of stock")

return err
}

return nil
},
checkStockOffer(),
addSSH("key", sshKey),
createServerAndWait(),
),
Expand All @@ -54,18 +38,7 @@ func Test_InstallServer(t *testing.T) {
t.Run("All SSH keys", core.Test(&core.TestConfig{
Commands: cmds,
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
addSSH("key", sshKey),
createServerAndWait(),
),
Expand Down
40 changes: 3 additions & 37 deletions internal/namespaces/baremetal/v1/custom_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package baremetal_test

import (
"errors"
"testing"

"github.com/scaleway/scaleway-cli/v2/core"
Expand All @@ -13,18 +12,7 @@ import (
func Test_StartServerErrors(t *testing.T) {
t.Run("Error: cannot be started while not delivered", core.Test(&core.TestConfig{
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameSATA,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
createServer("Server", offerNameSATA),
),
Commands: baremetal.GetCommands(),
Expand Down Expand Up @@ -54,18 +42,7 @@ func Test_StartServerErrors(t *testing.T) {
func Test_StopServerErrors(t *testing.T) {
t.Run("Error: cannot be stopped while not delivered", core.Test(&core.TestConfig{
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameSATA,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
createServer("Server", offerNameSATA),
),
Commands: baremetal.GetCommands(),
Expand Down Expand Up @@ -95,18 +72,7 @@ func Test_StopServerErrors(t *testing.T) {
func Test_RebootServerErrors(t *testing.T) {
t.Run("Error: cannot be rebooted while not delivered", core.Test(&core.TestConfig{
BeforeFunc: core.BeforeFuncCombine(
func(ctx *core.BeforeFuncCtx) error {
api := baremetalSDK.NewAPI(ctx.Client)
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
OfferName: offerNameSATA,
Zone: scw.Zone(zone),
})
if server.Stock != baremetalSDK.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
},
checkStockOffer(),
createServer("Server", offerNameSATA),
),
Commands: baremetal.GetCommands(),
Expand Down
23 changes: 23 additions & 0 deletions internal/namespaces/baremetal/v1/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package baremetal_test

import (
"errors"
"fmt"
"os"

"github.com/scaleway/scaleway-cli/v2/core"
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func getenv(key, fallback string) string {
Expand Down Expand Up @@ -54,3 +57,23 @@ func addSSH(metaKey string, key string) core.BeforeFunc {
func deleteSSH(metaKey string) core.AfterFunc {
return core.ExecAfterCmd(fmt.Sprintf("scw iam ssh-key delete {{ .%s.ID }}", metaKey))
}

func checkStockOffer() func(ctx *core.BeforeFuncCtx) error {
return func(ctx *core.BeforeFuncCtx) error {
api := baremetal.NewAPI(ctx.Client)

offer, err := api.GetOfferByName(&baremetal.GetOfferByNameRequest{
OfferName: offerNameNVME,
Zone: scw.Zone(zone),
})
if err != nil {
return err
}

if offer.Stock != baremetal.OfferStockAvailable {
return errors.New("offer out of stock")
}

return nil
}
}
Loading