Skip to content

fix(baremetal): change offer in tests #2781

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 8 commits into from
Nov 5, 2024
Merged

fix(baremetal): change offer in tests #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3b86ea
fix(baremetal): change offer in tests
Laure-di Oct 23, 2024
fbf30ce
tests(baremetal): change offer
Laure-di Oct 29, 2024
9015758
check if offer available before running tests
Laure-di Oct 29, 2024
da2304a
fix tests
Laure-di Oct 29, 2024
6cb6192
test fic
Laure-di Nov 4, 2024
ce786e2
Merge branch 'master' into fix-test-baremetal
Laure-di Nov 4, 2024
000de8e
fix golangci-lint
Laure-di Nov 4, 2024
eadf630
fix region to zone
Laure-di Nov 5, 2024
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
16 changes: 16 additions & 0 deletions internal/services/baremetal/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package baremetal_test

import (
"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 {
api := baremetal.NewAPI(tt.Meta.ScwClient())
offer, _ := api.GetOffer(&baremetal.GetOfferRequest{
Zone: zone,
OfferID: offerID,
})
return offer.Stock == baremetal.OfferStockAvailable
}
2 changes: 1 addition & 1 deletion internal/services/baremetal/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

const (
ServerTimeout = 60 * time.Minute
ServerTimeout = 80 * time.Minute
serverRetryFuncTimeout = ServerTimeout + time.Minute // some RetryFunc are calling a WaitFor
defaultServerTimeout = serverRetryFuncTimeout + time.Minute
retryInterval = 5 * time.Second
Expand Down
123 changes: 69 additions & 54 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,46 +13,55 @@ 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"
)

func TestAccDataSourceOffer_Basic(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
if !IsOfferAvailable(OfferID, Zone, tt) {
t.Skip("Offer is out of stock")
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
Steps: []resource.TestStep{
{
Config: `
Config: fmt.Sprintf(`
data "scaleway_baremetal_offer" "test1" {
zone = "fr-par-1"
name = "EM-A115X-SSD"
name = "%s"
}

data "scaleway_baremetal_offer" "test2" {
offer_id = data.scaleway_baremetal_offer.test1.offer_id
}
`,
`, OfferName),
Check: resource.ComposeTestCheckFunc(
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
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", "EM-A115X-SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
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", "500000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
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", "stock", "available"), // skipping this as stocks vary too much
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
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", "4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
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"),
),
},
Expand All @@ -63,47 +72,50 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
if !IsOfferAvailable(OfferID, Zone, tt) {
t.Skip("Offer is out of stock")
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
Steps: []resource.TestStep{
{
Config: `
Config: fmt.Sprintf(`
data "scaleway_baremetal_offer" "test1" {
zone = "fr-par-1"
name = "EM-A115X-SSD"
name = "%s"

subscription_period = "hourly"
}

data "scaleway_baremetal_offer" "test2" {
offer_id = data.scaleway_baremetal_offer.test1.offer_id
}
`,
`, OfferName),
Check: resource.ComposeTestCheckFunc(
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "hourly"),
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", "EM-A115X-SSD"),
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", "aluminium"),
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", "500000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
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", "stock", "available"), // skipping this as stocks vary too much
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
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", "4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
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"),
),
},
Expand All @@ -114,47 +126,50 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
if !IsOfferAvailable(OfferID, Zone, tt) {
t.Skip("Offer is out of stock")
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
Steps: []resource.TestStep{
{
Config: `
Config: fmt.Sprintf(`
data "scaleway_baremetal_offer" "test1" {
zone = "fr-par-1"
name = "EM-A115X-SSD"
name = "%s"

subscription_period = "monthly"
}

data "scaleway_baremetal_offer" "test2" {
offer_id = data.scaleway_baremetal_offer.test1.offer_id
}
`,
`, OfferName),
Check: resource.ComposeTestCheckFunc(
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "monthly"),
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", "EM-A115X-SSD"),
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", "aluminium"),
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", "500000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
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", "stock", "available"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
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", "4"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
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"),
),
},
Expand Down
11 changes: 7 additions & 4 deletions 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 @@ -12,6 +12,9 @@ import (
func TestAccDataSourceServer_Basic(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
if !IsOfferAvailable(OfferID, Zone, tt) {
t.Skip("Offer is out of stock")
}

SSHKeyName := "TestAccScalewayDataSourceBaremetalServer_Basic"
name := "TestAccScalewayDataSourceBaremetalServer_Basic"
Expand All @@ -31,7 +34,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {

data "scaleway_baremetal_offer" "my_offer" {
zone = "fr-par-1"
name = "EM-A115X-SSD"
name = "%s"
}

resource "scaleway_iam_ssh_key" "main" {
Expand All @@ -48,7 +51,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {

ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
}
`, SSHKeyName, SSHKeyBaremetal, name),
`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
},
{
Config: fmt.Sprintf(`
Expand All @@ -60,7 +63,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {

data "scaleway_baremetal_offer" "my_offer" {
zone = "fr-par-1"
name = "EM-A115X-SSD"
name = "%s"
}

resource "scaleway_iam_ssh_key" "main" {
Expand All @@ -87,7 +90,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
server_id = "${scaleway_baremetal_server.main.id}"
zone = "fr-par-1"
}
`, SSHKeyName, SSHKeyBaremetal, name),
`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
Check: resource.ComposeTestCheckFunc(
testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_id"),
testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_name"),
Expand Down
Loading
Loading