Skip to content

Commit 8024a7a

Browse files
committed
fix(baremetal): switch to env var
1 parent d9a901c commit 8024a7a

File tree

5 files changed

+27
-14
lines changed

5 files changed

+27
-14
lines changed

internal/namespaces/baremetal/v1/custom_server_create_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import (
77
"github.com/scaleway/scaleway-cli/v2/core"
88
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
99
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
10+
"github.com/scaleway/scaleway-sdk-go/scw"
1011
"github.com/stretchr/testify/assert"
1112
)
1213

13-
const (
14-
offerNameNVME = "EM-I215E-NVME"
15-
offerNameSATA = "EM-B111X-SATA"
16-
zone = "fr-par-2"
14+
var (
15+
offerNameNVME = getenv("OFFER_NAME_NVME", "EM-I215E-NVME")
16+
offerNameSATA = getenv("OFFER_NAME_SATA", "EM-B111X-SATA")
17+
zone = getenv("zone", "fr-par-2")
1718
)
1819

1920
// All test below should succeed to create an instance.
@@ -26,7 +27,7 @@ func Test_CreateServer(t *testing.T) {
2627
api := baremetalSDK.NewAPI(ctx.Client)
2728
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
2829
OfferName: offerNameNVME,
29-
Zone: zone,
30+
Zone: scw.Zone(zone),
3031
})
3132
if server.Stock != baremetalSDK.OfferStockAvailable {
3233
return errors.New("offer out of stock")
@@ -51,7 +52,7 @@ func Test_CreateServer(t *testing.T) {
5152
api := baremetalSDK.NewAPI(ctx.Client)
5253
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
5354
OfferName: offerNameNVME,
54-
Zone: zone,
55+
Zone: scw.Zone(zone),
5556
})
5657
if server.Stock != baremetalSDK.OfferStockAvailable {
5758
return errors.New("offer out of stock")
@@ -82,7 +83,7 @@ func Test_CreateServer(t *testing.T) {
8283
api := baremetalSDK.NewAPI(ctx.Client)
8384
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
8485
OfferName: offerNameNVME,
85-
Zone: zone,
86+
Zone: scw.Zone(zone),
8687
})
8788
if server.Stock != baremetalSDK.OfferStockAvailable {
8889
return errors.New("offer out of stock")

internal/namespaces/baremetal/v1/custom_server_fip_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
1010
flexibleip "github.com/scaleway/scaleway-cli/v2/internal/namespaces/flexibleip/v1alpha1"
1111
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
12+
"github.com/scaleway/scaleway-sdk-go/scw"
1213
)
1314

1415
func Test_CreateFlexibleIPInteractive(t *testing.T) {
@@ -25,7 +26,7 @@ func Test_CreateFlexibleIPInteractive(t *testing.T) {
2526
api := baremetalSDK.NewAPI(ctx.Client)
2627
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
2728
OfferName: offerNameNVME,
28-
Zone: zone,
29+
Zone: scw.Zone(zone),
2930
})
3031
if server.Stock != baremetalSDK.OfferStockAvailable {
3132
return errors.New("offer out of stock")
@@ -58,7 +59,7 @@ func Test_CreateFlexibleIP(t *testing.T) {
5859
api := baremetalSDK.NewAPI(ctx.Client)
5960
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
6061
OfferName: offerNameNVME,
61-
Zone: zone,
62+
Zone: scw.Zone(zone),
6263
})
6364
if server.Stock != baremetalSDK.OfferStockAvailable {
6465
return errors.New("offer out of stock")

internal/namespaces/baremetal/v1/custom_server_install_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
99
iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
1010
baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
11+
"github.com/scaleway/scaleway-sdk-go/scw"
1112
)
1213

1314
func Test_InstallServer(t *testing.T) {
@@ -25,7 +26,7 @@ func Test_InstallServer(t *testing.T) {
2526
api := baremetalSDK.NewAPI(ctx.Client)
2627
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
2728
OfferName: offerNameNVME,
28-
Zone: zone,
29+
Zone: scw.Zone(zone),
2930
})
3031
if server.Stock != baremetalSDK.OfferStockAvailable {
3132
err := errors.New("offer out of stock")
@@ -57,7 +58,7 @@ func Test_InstallServer(t *testing.T) {
5758
api := baremetalSDK.NewAPI(ctx.Client)
5859
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
5960
OfferName: offerNameNVME,
60-
Zone: zone,
61+
Zone: scw.Zone(zone),
6162
})
6263
if server.Stock != baremetalSDK.OfferStockAvailable {
6364
return errors.New("offer out of stock")

internal/namespaces/baremetal/v1/custom_server_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func Test_StartServerErrors(t *testing.T) {
1717
api := baremetalSDK.NewAPI(ctx.Client)
1818
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
1919
OfferName: offerNameSATA,
20-
Zone: zone,
20+
Zone: scw.Zone(zone),
2121
})
2222
if server.Stock != baremetalSDK.OfferStockAvailable {
2323
return errors.New("offer out of stock")
@@ -58,7 +58,7 @@ func Test_StopServerErrors(t *testing.T) {
5858
api := baremetalSDK.NewAPI(ctx.Client)
5959
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
6060
OfferName: offerNameSATA,
61-
Zone: zone,
61+
Zone: scw.Zone(zone),
6262
})
6363
if server.Stock != baremetalSDK.OfferStockAvailable {
6464
return errors.New("offer out of stock")
@@ -99,7 +99,7 @@ func Test_RebootServerErrors(t *testing.T) {
9999
api := baremetalSDK.NewAPI(ctx.Client)
100100
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
101101
OfferName: offerNameSATA,
102-
Zone: zone,
102+
Zone: scw.Zone(zone),
103103
})
104104
if server.Stock != baremetalSDK.OfferStockAvailable {
105105
return errors.New("offer out of stock")

internal/namespaces/baremetal/v1/helpers_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ package baremetal_test
22

33
import (
44
"fmt"
5+
"os"
56

67
"github.com/scaleway/scaleway-cli/v2/core"
78
)
89

10+
func getenv(key, fallback string) string {
11+
value := os.Getenv(key)
12+
if len(value) == 0 {
13+
return fallback
14+
}
15+
16+
return value
17+
}
18+
919
// createServerAndWait creates a baremetal instance
1020
// register it in the context Meta at metaKey.
1121
func createServerAndWait() core.BeforeFunc {

0 commit comments

Comments
 (0)