Skip to content

Commit effe43c

Browse files
authored
fix(instance): add missing zone in a volume request (#820)
1 parent f5383fb commit effe43c

3 files changed

+3477
-0
lines changed

scaleway/resource_instance_server.go

+1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
297297
for i, volumeID := range raw.([]interface{}) {
298298
// We have to get the volume to know whether it is a local or a block volume
299299
vol, err := instanceAPI.GetVolume(&instance.GetVolumeRequest{
300+
Zone: zone,
300301
VolumeID: expandZonedID(volumeID).ID,
301302
})
302303
if err != nil {

scaleway/resource_instance_server_test.go

+36
Original file line numberDiff line numberDiff line change
@@ -882,3 +882,39 @@ func TestAccScalewayInstanceServer_Enterprise(t *testing.T) {
882882
},
883883
})
884884
}
885+
886+
func TestAccScalewayInstanceServer_ServerWithBlockNonDefaultZone(t *testing.T) {
887+
tt := NewTestTools(t)
888+
defer tt.Cleanup()
889+
resource.ParallelTest(t, resource.TestCase{
890+
PreCheck: func() { testAccPreCheck(t) },
891+
ProviderFactories: tt.ProviderFactories,
892+
CheckDestroy: testAccCheckScalewayInstanceServerDestroy(tt),
893+
Steps: []resource.TestStep{
894+
{
895+
Config: `
896+
resource "scaleway_instance_volume" "main" {
897+
type = "b_ssd"
898+
name = "main"
899+
size_in_gb = 1
900+
zone = "nl-ams-1"
901+
}
902+
903+
resource "scaleway_instance_server" "main" {
904+
zone = "nl-ams-1"
905+
image = "ubuntu_focal"
906+
type = "DEV1-S"
907+
root_volume {
908+
delete_on_termination = true
909+
size_in_gb = 20
910+
}
911+
additional_volume_ids = [scaleway_instance_volume.main.id]
912+
}
913+
`,
914+
Check: resource.ComposeTestCheckFunc(
915+
testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.main"),
916+
),
917+
},
918+
},
919+
})
920+
}

0 commit comments

Comments
 (0)