Skip to content

fix(block): remove unecessary test migration block #3213

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

Closed
wants to merge 15 commits into from
Closed

fix(block): remove unecessary test migration block #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
339752f
fix(baremetal): refacto and update offer tests
Laure-di Jul 9, 2025
d22347f
update cassette
Laure-di Jul 9, 2025
52a3aaf
golangci lint
Laure-di Jul 9, 2025
caa4d52
update cassettes
Laure-di Jul 11, 2025
64a3746
test: switch const to env var
Laure-di Jul 11, 2025
af277b3
tests: register cassettes
Laure-di Jul 11, 2025
15b7103
fix: linter
Laure-di Jul 11, 2025
0fd331c
tests: register cassettes
Laure-di Jul 11, 2025
2eb0921
Merge branch 'master' into update-test-baremetal
Laure-di Jul 11, 2025
2dd91d1
tests: register cassettes
Laure-di Jul 11, 2025
4810f11
Delete internal/services/block/testdata/volume-from-snapshot-with-sma…
Laure-di Jul 11, 2025
beadd60
Delete internal/services/block/testdata/volume-from-snapshot-with-new…
Laure-di Jul 11, 2025
95e98de
tests: register cassettes
Laure-di Jul 11, 2025
1ef15cd
tests: register cassettes
Laure-di Jul 11, 2025
2430600
tests: register cassettes
Laure-di Jul 11, 2025
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
66 changes: 33 additions & 33 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 @@ -14,9 +14,12 @@ import (
)

const (
OfferName = "EM-B220E-NVME"
Zone = "fr-par-1"
OfferID = "206ea234-9097-4ae1-af68-6d2be09f47ed"
OfferID = "ddb09834-8680-4339-b5e3-19ca5205fa1f"
)

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,21 +47,20 @@ 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", "commercial_range", "iridium"),
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", "cpu.0.name", "AMD EPYC 7313P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "32"),
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.0.capacity", "1920383410176"),
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", "disk.1.capacity", "1920383410176"),
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.capacity", "256000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
),
},
Expand Down Expand Up @@ -95,21 +97,20 @@ 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", "commercial_range", "iridium"),
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", "cpu.0.name", "AMD EPYC 7313P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "32"),
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.0.capacity", "1920383410176"),
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", "disk.1.capacity", "1920383410176"),
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.capacity", "256000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
),
},
Expand Down Expand Up @@ -146,21 +147,20 @@ 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", "commercial_range", "iridium"),
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", "cpu.0.name", "AMD EPYC 7313P"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "16"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "32"),
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.0.capacity", "1920383410176"),
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", "disk.1.capacity", "1920383410176"),
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.capacity", "256000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
),
},
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