Skip to content

ci(baremetal): refacto and update offer tests #3205

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 1 commit into from
Jul 23, 2025
Merged

ci(baremetal): refacto and update offer tests #3205

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
19 changes: 15 additions & 4 deletions internal/services/baremetal/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
package baremetal_test

import (
"os"

"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
)

func IsOfferAvailable(offerID string, zone scw.Zone, tt *acctest.TestTools) bool {
func getenv(key, fallback string) string {
value := os.Getenv(key)
if value == "" {
return fallback
}

return value
}

func IsOfferAvailable(offerName string, zone scw.Zone, tt *acctest.TestTools) bool {
api := baremetal.NewAPI(tt.Meta.ScwClient())
offer, _ := api.GetOffer(&baremetal.GetOfferRequest{
Zone: zone,
OfferID: offerID,
offer, _ := api.GetOfferByName(&baremetal.GetOfferByNameRequest{
OfferName: offerName,
Zone: zone,
})

return offer.Stock == baremetal.OfferStockAvailable
Expand Down
100 changes: 48 additions & 52 deletions internal/services/baremetal/offer_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ import (
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal"
)

const (
OfferName = "EM-B220E-NVME"
Zone = "fr-par-1"
OfferID = "206ea234-9097-4ae1-af68-6d2be09f47ed"
var (
OfferName = getenv("OFFER_NAME", "EM-I215E-NVME")
Zone = getenv("ZONE", "fr-par-2")
)

func TestAccDataSourceOffer_Basic(t *testing.T) {
Expand Down Expand Up @@ -44,22 +43,21 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD EPYC 7232P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "8"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "64000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "2400"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "commercial_range"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "include_disabled"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "bandwidth"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.name"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.core_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc"),
),
},
},
Expand Down Expand Up @@ -95,22 +93,21 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "hourly"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD EPYC 7232P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "8"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "64000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "2400"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "commercial_range"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "include_disabled"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "bandwidth"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.name"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.core_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc"),
),
},
},
Expand Down Expand Up @@ -146,22 +143,21 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "monthly"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD EPYC 7232P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "8"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "NVMe"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1024209543168"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "64000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "2400"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "commercial_range"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "include_disabled"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "bandwidth"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.name"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.core_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "disk.1.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.type"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.capacity"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.frequency"),
resource.TestCheckResourceAttrSet("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc"),
),
},
},
Expand Down
7 changes: 3 additions & 4 deletions internal/services/baremetal/partition_schema_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
)

const (
offerNameEasyPartitioning = "EM-B220E-NVME"
incompatibleOfferName = "EM-L110X-SATA"
AlternativeOfferNameEasyPartitioning = "EM-B420E-NVME"
mountpoint = "/data"
Expand Down Expand Up @@ -73,7 +72,7 @@ func TestAccPartitionSchemaDataSource_Basic(t *testing.T) {
}
`,
Zone,
offerNameEasyPartitioning,
OfferName,
Zone,
sshKeyName,
SSHKeyBaremetal,
Expand Down Expand Up @@ -141,7 +140,7 @@ func TestAccPartitionSchemaDataSource_WithoutExtraPart(t *testing.T) {
}
`,
Zone,
offerNameEasyPartitioning,
OfferName,
Zone,
sshKeyName,
SSHKeyBaremetal,
Expand Down Expand Up @@ -208,7 +207,7 @@ func TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart(t *testing.T) {
}
`,
Zone,
offerNameEasyPartitioning,
OfferName,
Zone,
sshKeyName,
SSHKeyBaremetal,
Expand Down
3 changes: 2 additions & 1 deletion internal/services/baremetal/server_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
baremetalchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal/testfuncs"
)
Expand All @@ -13,7 +14,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

if !IsOfferAvailable(OfferID, Zone, tt) {
if !IsOfferAvailable(OfferName, scw.Zone(Zone), tt) {
t.Skip("Offer is out of stock")
}

Expand Down
Loading
Loading