@@ -24,13 +24,13 @@ func TestAccServer_Basic(t *testing.T) {
2424 {
2525 Config : `
2626 resource scaleway_apple_silicon_server main {
27- name = "test-m2 "
27+ name = "TestAccServerBasic "
2828 type = "M2-M"
2929 }
3030 ` ,
3131 Check : resource .ComposeTestCheckFunc (
3232 isServerPresent (tt , "scaleway_apple_silicon_server.main" ),
33- resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "test-m2 " ),
33+ resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "TestAccServerBasic " ),
3434 resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "type" , "M2-M" ),
3535 // Computed
3636 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "ip" ),
@@ -55,61 +55,52 @@ func TestAccServer_EnableVPC(t *testing.T) {
5555 {
5656 Config : `
5757 resource "scaleway_vpc" "vpc01" {
58- name = "TestAccServer_EnableVPC "
58+ name = "TestAccServerEnableVPC "
5959 }
6060
6161 resource "scaleway_vpc_private_network" "pn01" {
62- name = "TestAccServer_EnableVPC "
62+ name = "TestAccServerEnableVPC "
6363 ipv4_subnet {
6464 subnet = "172.16.64.0/22"
6565 }
6666 vpc_id = scaleway_vpc.vpc01.id
6767 }
68-
69- resource "scaleway_ipam_ip" "ip01" {
70- address = "172.16.64.7"
71- source {
72- private_network_id = scaleway_vpc_private_network.pn01.id
73- }
74- }
75-
76- resource "scaleway_ipam_ip" "ip02" {
77- address = "172.16.64.9"
78- source {
79- private_network_id = scaleway_vpc_private_network.pn01.id
80- }
81- }
8268
8369 resource scaleway_apple_silicon_server main {
84- name = "test-m2 "
70+ name = "TestAccServerEnableVPC "
8571 type = "M2-M"
8672 enable_vpc = true
73+ private_network {
74+ id = scaleway_vpc_private_network.pn01.id
75+ }
8776 }
8877 ` ,
8978 Check : resource .ComposeTestCheckFunc (
9079 isServerPresent (tt , "scaleway_apple_silicon_server.main" ),
91- resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "test-m2 " ),
80+ resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "TestAccServerEnableVPC " ),
9281 resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "type" , "M2-M" ),
9382 // Computed
9483 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "ip" ),
9584 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "vnc_url" ),
9685 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "created_at" ),
9786 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "deletable_at" ),
87+ resource .TestCheckResourceAttrPair ("scaleway_apple_silicon_server.main" , "private_network.0.id" , "scaleway_vpc_private_network.pn01" , "id" ),
9888 resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "vpc_status" , "vpc_enabled" ),
9989 ),
10090 },
10191 {
10292 Config : `
103- resource scaleway_apple_silicon_server main {
104- name = "test-m2 "
105- type = "M2-M"
106- enable_vpc = false
107- }
108- ` ,
93+ resource scaleway_apple_silicon_server main {
94+ name = "TestAccServerEnableVPC "
95+ type = "M2-M"
96+ enable_vpc = false
97+ }
98+ ` ,
10999 Check : resource .ComposeTestCheckFunc (
110100 isServerPresent (tt , "scaleway_apple_silicon_server.main" ),
111- resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "test-m2 " ),
101+ resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "name" , "TestAccServerEnableVPC " ),
112102 resource .TestCheckResourceAttr ("scaleway_apple_silicon_server.main" , "type" , "M2-M" ),
103+ resource .TestCheckNoResourceAttr ("scaleway_apple_silicon_server.main" , "private_network" ),
113104 // Computed
114105 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "ip" ),
115106 resource .TestCheckResourceAttrSet ("scaleway_apple_silicon_server.main" , "vnc_url" ),
0 commit comments