Skip to content

Commit 8b5ceed

Browse files
MonitobMonitob
committed
fix(baremetal): replace account api on baremetal test
1 parent 46e11e1 commit 8b5ceed

File tree

2 files changed

+50
-38
lines changed

2 files changed

+50
-38
lines changed

‎scaleway/data_source_baremetal_server_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestAccScalewayDataSourceBaremetalServer_Basic(t *testing.T) {
3232
name = "EM-B112X-SSD"
3333
}
3434
35-
resource "scaleway_account_ssh_key" "main" {
35+
resource "scaleway_iam_ssh_key" "main" {
3636
name = "%s"
3737
public_key = "%s"
3838
}
@@ -44,7 +44,7 @@ func TestAccScalewayDataSourceBaremetalServer_Basic(t *testing.T) {
4444
offer = data.scaleway_baremetal_offer.my_offer.offer_id
4545
os = data.scaleway_baremetal_os.my_os.os_id
4646
47-
ssh_key_ids = [ scaleway_account_ssh_key.main.id ]
47+
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
4848
}
4949
`, SSHKeyName, SSHKeyBaremetal, name),
5050
},
@@ -61,7 +61,7 @@ func TestAccScalewayDataSourceBaremetalServer_Basic(t *testing.T) {
6161
name = "EM-B112X-SSD"
6262
}
6363
64-
resource "scaleway_account_ssh_key" "main" {
64+
resource "scaleway_iam_ssh_key" "main" {
6565
name = "%s"
6666
public_key = "%s"
6767
}
@@ -73,7 +73,7 @@ func TestAccScalewayDataSourceBaremetalServer_Basic(t *testing.T) {
7373
offer = data.scaleway_baremetal_offer.my_offer.offer_id
7474
os = data.scaleway_baremetal_os.my_os.os_id
7575
76-
ssh_key_ids = [ scaleway_account_ssh_key.main.id ]
76+
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
7777
}
7878
7979
data "scaleway_baremetal_server" "by_name" {

‎scaleway/resource_baremetal_server_test.go‎

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,13 @@ func TestAccScalewayBaremetalServer_Basic(t *testing.T) {
5959
Steps: []resource.TestStep{
6060
{
6161
Config: fmt.Sprintf(`
62-
resource "scaleway_account_ssh_key" "main" {
62+
data "scaleway_baremetal_os" "my_os" {
63+
zone = "fr-par-2"
64+
name = "Ubuntu"
65+
version = "22.04 LTS (Jammy Jellyfish)"
66+
}
67+
68+
resource "scaleway_iam_ssh_key" "main" {
6369
name = "%s"
6470
public_key = "%s"
6571
}
@@ -68,18 +74,18 @@ func TestAccScalewayBaremetalServer_Basic(t *testing.T) {
6874
name = "%s"
6975
zone = "fr-par-2"
7076
description = "test a description"
71-
offer = "GP-BM1-M"
72-
os = "d17d6872-0412-45d9-a198-af82c34d3c5c"
77+
offer = "EM-B112X-SSD"
78+
os = data.scaleway_baremetal_os.my_os.os_id
7379
7480
tags = [ "terraform-test", "scaleway_baremetal_server", "minimal" ]
75-
ssh_key_ids = [ scaleway_account_ssh_key.main.id ]
81+
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
7682
}
7783
`, SSHKeyName, SSHKeyBaremetal, name),
7884
Check: resource.ComposeTestCheckFunc(
7985
testAccCheckScalewayBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
8086
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "name", name),
81-
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "offer_id", "fr-par-2/964f9b38-577e-470f-a220-7d762f9e8672"),
82-
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "os_id", "fr-par-2/d17d6872-0412-45d9-a198-af82c34d3c5c"),
87+
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "offer_id", "fr-par-2/a5065ba4-dde2-45f3-adec-1ebbb27b766b"),
88+
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "os", "fr-par-2/96e5f0f2-d216-4de2-8a15-68730d877885"),
8389
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "description", "test a description"),
8490
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "tags.0", "terraform-test"),
8591
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "tags.1", "scaleway_baremetal_server"),
@@ -90,7 +96,13 @@ func TestAccScalewayBaremetalServer_Basic(t *testing.T) {
9096
{
9197
// Trigger a reinstall and update tags
9298
Config: fmt.Sprintf(`
93-
resource "scaleway_account_ssh_key" "main" {
99+
data "scaleway_baremetal_os" "my_os" {
100+
zone = "fr-par-2"
101+
name = "Ubuntu"
102+
version = "22.04 LTS (Jammy Jellyfish)"
103+
}
104+
105+
resource "scaleway_iam_ssh_key" "main" {
94106
name = "%s"
95107
public_key = "%s"
96108
}
@@ -99,18 +111,18 @@ func TestAccScalewayBaremetalServer_Basic(t *testing.T) {
99111
name = "%s"
100112
zone = "fr-par-2"
101113
description = "test a description"
102-
offer = "GP-BM1-M"
103-
os = "d859aa89-8b4a-4551-af42-ff7c0c27260a"
114+
offer = "EM-B112X-SSD"
115+
os = data.scaleway_baremetal_os.my_os.os_id
104116
105117
tags = [ "terraform-test", "scaleway_baremetal_server", "minimal", "edited" ]
106-
ssh_key_ids = [ scaleway_account_ssh_key.main.id ]
118+
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
107119
}
108120
`, SSHKeyName, SSHKeyBaremetal, name),
109121
Check: resource.ComposeTestCheckFunc(
110122
testAccCheckScalewayBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
111123
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "name", name),
112-
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "offer_id", "fr-par-2/964f9b38-577e-470f-a220-7d762f9e8672"),
113-
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "os_id", "fr-par-2/d859aa89-8b4a-4551-af42-ff7c0c27260a"),
124+
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "offer_id", "fr-par-2/a5065ba4-dde2-45f3-adec-1ebbb27b766b"),
125+
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "os", "fr-par-2/96e5f0f2-d216-4de2-8a15-68730d877885"),
114126
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "description", "test a description"),
115127
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "tags.#", "4"),
116128
resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "tags.0", "terraform-test"),
@@ -179,7 +191,7 @@ func TestAccScalewayBaremetalServer_CreateServerWithOption(t *testing.T) {
179191
name = "Private Network"
180192
}
181193
182-
resource "scaleway_account_ssh_key" "base" {
194+
resource "scaleway_iam_ssh_key" "base" {
183195
name = "%s"
184196
public_key = "%s"
185197
}
@@ -190,7 +202,7 @@ func TestAccScalewayBaremetalServer_CreateServerWithOption(t *testing.T) {
190202
offer = data.scaleway_baremetal_offer.my_offer.offer_id
191203
os = data.scaleway_baremetal_os.my_os.os_id
192204
193-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
205+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
194206
options {
195207
id = data.scaleway_baremetal_option.private_network.option_id
196208
}
@@ -231,7 +243,7 @@ func TestAccScalewayBaremetalServer_AddOption(t *testing.T) {
231243
name = "EM-B112X-SSD"
232244
}
233245
234-
resource "scaleway_account_ssh_key" "base" {
246+
resource "scaleway_iam_ssh_key" "base" {
235247
name = "%s"
236248
public_key = "%s"
237249
}
@@ -242,7 +254,7 @@ func TestAccScalewayBaremetalServer_AddOption(t *testing.T) {
242254
offer = data.scaleway_baremetal_offer.my_offer.offer_id
243255
os = data.scaleway_baremetal_os.by_id.os_id
244256
245-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
257+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
246258
}
247259
`, SSHKeyName, SSHKeyBaremetal, name),
248260
Check: resource.ComposeTestCheckFunc(
@@ -267,7 +279,7 @@ func TestAccScalewayBaremetalServer_AddOption(t *testing.T) {
267279
name = "Private Network"
268280
}
269281
270-
resource "scaleway_account_ssh_key" "base" {
282+
resource "scaleway_iam_ssh_key" "base" {
271283
name = "%s"
272284
public_key = "%s"
273285
}
@@ -278,7 +290,7 @@ func TestAccScalewayBaremetalServer_AddOption(t *testing.T) {
278290
offer = data.scaleway_baremetal_offer.my_offer.offer_id
279291
os = data.scaleway_baremetal_os.my_os.os_id
280292
281-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
293+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
282294
options {
283295
id = data.scaleway_baremetal_option.private_network.option_id
284296
}
@@ -319,7 +331,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
319331
name = "EM-B112X-SSD"
320332
}
321333
322-
resource "scaleway_account_ssh_key" "base" {
334+
resource "scaleway_iam_ssh_key" "base" {
323335
name = "%s"
324336
public_key = "%s"
325337
}
@@ -330,7 +342,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
330342
offer = data.scaleway_baremetal_offer.my_offer.offer_id
331343
os = data.scaleway_baremetal_os.by_id.os_id
332344
333-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
345+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
334346
}
335347
`, SSHKeyName, SSHKeyBaremetal, name),
336348
Check: resource.ComposeTestCheckFunc(
@@ -360,7 +372,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
360372
name = "Private Network"
361373
}
362374
363-
resource "scaleway_account_ssh_key" "base" {
375+
resource "scaleway_iam_ssh_key" "base" {
364376
name = "%s"
365377
public_key = "%s"
366378
}
@@ -370,7 +382,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
370382
zone = "fr-par-2"
371383
offer = data.scaleway_baremetal_offer.my_offer.offer_id
372384
os = data.scaleway_baremetal_os.my_os.os_id
373-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
385+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
374386
375387
options {
376388
id = data.scaleway_baremetal_option.private_network.option_id
@@ -413,7 +425,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
413425
name = "Remote Access"
414426
}
415427
416-
resource "scaleway_account_ssh_key" "base" {
428+
resource "scaleway_iam_ssh_key" "base" {
417429
name = "%s"
418430
public_key = "%s"
419431
}
@@ -423,7 +435,7 @@ func TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
423435
zone = "fr-par-2"
424436
offer = data.scaleway_baremetal_offer.my_offer.offer_id
425437
os = data.scaleway_baremetal_os.my_os.os_id
426-
ssh_key_ids = [scaleway_account_ssh_key.base.id]
438+
ssh_key_ids = [scaleway_iam_ssh_key.base.id]
427439
428440
options {
429441
id = data.scaleway_baremetal_option.remote_access.option_id
@@ -482,7 +494,7 @@ func TestAccScalewayBaremetalServer_CreateServerWithPrivateNetwork(t *testing.T)
482494
name = "baremetal_private_network"
483495
}
484496
485-
resource "scaleway_account_ssh_key" "base" {
497+
resource "scaleway_iam_ssh_key" "base" {
486498
name = "%s"
487499
public_key = "%s"
488500
}
@@ -493,7 +505,7 @@ func TestAccScalewayBaremetalServer_CreateServerWithPrivateNetwork(t *testing.T)
493505
offer = data.scaleway_baremetal_offer.my_offer.offer_id
494506
os = data.scaleway_baremetal_os.my_os.os_id
495507
496-
ssh_key_ids = [ scaleway_account_ssh_key.base.id ]
508+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
497509
options {
498510
id = data.scaleway_baremetal_option.private_network.option_id
499511
}
@@ -549,7 +561,7 @@ func TestAccScalewayBaremetalServer_AddPrivateNetwork(t *testing.T) {
549561
name = "baremetal_private_network"
550562
}
551563
552-
resource "scaleway_account_ssh_key" "base" {
564+
resource "scaleway_iam_ssh_key" "base" {
553565
name = "%s"
554566
public_key = "%s"
555567
}
@@ -560,7 +572,7 @@ func TestAccScalewayBaremetalServer_AddPrivateNetwork(t *testing.T) {
560572
offer = data.scaleway_baremetal_offer.my_offer.offer_id
561573
os = data.scaleway_baremetal_os.my_os.os_id
562574
563-
ssh_key_ids = [ scaleway_account_ssh_key.base.id ]
575+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
564576
options {
565577
id = data.scaleway_baremetal_option.private_network.option_id
566578
}
@@ -593,7 +605,7 @@ func TestAccScalewayBaremetalServer_AddPrivateNetwork(t *testing.T) {
593605
name = "baremetal_private_network"
594606
}
595607
596-
resource "scaleway_account_ssh_key" "base" {
608+
resource "scaleway_iam_ssh_key" "base" {
597609
name = "%s"
598610
public_key = "%s"
599611
}
@@ -604,7 +616,7 @@ func TestAccScalewayBaremetalServer_AddPrivateNetwork(t *testing.T) {
604616
offer = data.scaleway_baremetal_offer.my_offer.offer_id
605617
os = data.scaleway_baremetal_os.my_os.os_id
606618
607-
ssh_key_ids = [ scaleway_account_ssh_key.base.id ]
619+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
608620
options {
609621
id = data.scaleway_baremetal_option.private_network.option_id
610622
}
@@ -660,7 +672,7 @@ func TestAccScalewayBaremetalServer_AddAnotherPrivateNetwork(t *testing.T) {
660672
name = "baremetal_private_network"
661673
}
662674
663-
resource "scaleway_account_ssh_key" "base" {
675+
resource "scaleway_iam_ssh_key" "base" {
664676
name = "%s"
665677
public_key = "%s"
666678
}
@@ -671,7 +683,7 @@ func TestAccScalewayBaremetalServer_AddAnotherPrivateNetwork(t *testing.T) {
671683
offer = data.scaleway_baremetal_offer.my_offer.offer_id
672684
os = data.scaleway_baremetal_os.my_os.os_id
673685
674-
ssh_key_ids = [ scaleway_account_ssh_key.base.id ]
686+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
675687
options {
676688
id = data.scaleway_baremetal_option.private_network.option_id
677689
}
@@ -714,7 +726,7 @@ func TestAccScalewayBaremetalServer_AddAnotherPrivateNetwork(t *testing.T) {
714726
name = "baremetal_private_network2"
715727
}
716728
717-
resource "scaleway_account_ssh_key" "base" {
729+
resource "scaleway_iam_ssh_key" "base" {
718730
name = "%s"
719731
public_key = "%s"
720732
}
@@ -725,7 +737,7 @@ func TestAccScalewayBaremetalServer_AddAnotherPrivateNetwork(t *testing.T) {
725737
offer = data.scaleway_baremetal_offer.my_offer.offer_id
726738
os = data.scaleway_baremetal_os.my_os.os_id
727739
728-
ssh_key_ids = [ scaleway_account_ssh_key.base.id ]
740+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
729741
options {
730742
id = data.scaleway_baremetal_option.private_network.option_id
731743
}

0 commit comments

Comments
 (0)