Skip to content

Commit 18da85a

Browse files
committed
update test disable vpc_option
1 parent db5b015 commit 18da85a

File tree

3 files changed

+1632
-511
lines changed

3 files changed

+1632
-511
lines changed

internal/services/applesilicon/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
272272
return diag.FromErr(err)
273273
}
274274

275-
if d.HasChange("private_network") {
275+
if d.HasChange("private_network") && d.Get("enable_vpc").(bool) {
276276
privateNetwork := d.Get("private_network")
277277
req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{
278278
Zone: zone,

internal/services/applesilicon/server_test.go

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) {
100100
}
101101

102102
func TestAccServer_EnableVPC(t *testing.T) {
103-
//t.Skip("Skipping AppleSilicon VPC not available")
104103
tt := acctest.NewTestTools(t)
105104
defer tt.Cleanup()
106105
resource.ParallelTest(t, resource.TestCase{
@@ -187,6 +186,44 @@ func TestAccServer_EnableVPC(t *testing.T) {
187186
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_enabled"),
188187
),
189188
},
189+
{
190+
Config: `
191+
resource "scaleway_vpc" "vpc01" {
192+
name = "TestAccServerEnableVPC"
193+
}
194+
195+
resource "scaleway_vpc_private_network" "pn01" {
196+
name = "TestAccServerEnableVPC"
197+
vpc_id = scaleway_vpc.vpc01.id
198+
}
199+
200+
resource "scaleway_vpc" "vpc02" {
201+
name = "TestAccServerEnableVPCTwo"
202+
}
203+
204+
resource "scaleway_vpc_private_network" "pn02" {
205+
name = "TestAccServerEnableVPCNumbertwo"
206+
vpc_id = scaleway_vpc.vpc02.id
207+
}
208+
209+
resource scaleway_apple_silicon_server main {
210+
name = "TestAccServerEnableVPC"
211+
type = "M2-M"
212+
enable_vpc = false
213+
}
214+
`,
215+
Check: resource.ComposeTestCheckFunc(
216+
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
217+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableVPC"),
218+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
219+
// Computed
220+
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
221+
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
222+
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
223+
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
224+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_disabled"),
225+
),
226+
},
190227
},
191228
})
192229
}

0 commit comments

Comments
 (0)