fix(compute): fix nightly tests (#3105)

* fix k8s

* instance: skip tests with bssd volumes/snapshots + remove cassettes

* nit block: align testfixture with other resources

Author: Mia-Cross

internal/services/block/snapshot_test.go

@@ -65,7 +65,7 @@ func TestAccSnapshot_FromS3(t *testing.T) {
 					resource "scaleway_object" "qcow-object" {
 					  bucket = scaleway_object_bucket.snapshot-bucket.name
 					  key    = "test-acc-block-snapshot.qcow2"
-					  file   = "testfixtures/small_image.qcow2"
+					  file   = "testfixture/small_image.qcow2"
 					}
 
 					resource "scaleway_block_snapshot" "qcow-block-snapshot" {

internal/services/block/testfixtures/small_image.qcow2 renamed to internal/services/block/testfixture/small_image.qcow2

@@ -15,6 +15,9 @@ import (
 )
 
 func TestAccImage_BlockVolume(t *testing.T) {
+	t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
+	// TestAccImage_ExternalBlockVolume should suffice to test the same logic with scaleway_block_volumes
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -213,7 +216,7 @@ func TestAccImage_Server(t *testing.T) {
 		ProviderFactories: tt.ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
 			isImageDestroyed(tt),
-			isSnapshotDestroyed(tt),
+			blocktestfuncs.IsSnapshotDestroyed(tt),
 			instancechecks.IsServerDestroyed(tt),
 		),
 		Steps: []resource.TestStep{
@@ -278,6 +281,9 @@ func TestAccImage_Server(t *testing.T) {
 }
 
 func TestAccImage_ServerWithBlockVolume(t *testing.T) {
+	t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
+	// TestAccImage_ServerWithSBSVolume should suffice to test the same logic with block volumes
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{

internal/services/instance/image_test.go

@@ -245,6 +245,8 @@ func TestAccServer_RootVolume_Boot(t *testing.T) {
 }
 
 func TestAccServer_RootVolume_ID(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -545,6 +547,8 @@ EOF
 }
 
 func TestAccServer_AdditionalVolumes(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -621,6 +625,8 @@ func TestAccServer_AdditionalVolumes(t *testing.T) {
 }
 
 func TestAccServer_AdditionalVolumesDetach(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -1009,6 +1015,8 @@ func TestAccServer_AlterTags(t *testing.T) {
 }
 
 func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -1041,6 +1049,8 @@ func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) {
 }
 
 func TestAccServer_ServerWithBlockNonDefaultZone(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_volume\" is deprecated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -1714,21 +1724,21 @@ func TestAccServer_BlockExternal(t *testing.T) {
 						size_in_gb = 10
 					}
 
-					resource "scaleway_instance_volume" "volume" {
-						type = "b_ssd"
-						size_in_gb = 10
+					resource "scaleway_block_volume" "bigger-volume" {
+						iops = 15000
+						size_in_gb = 15
 					}
 
 					resource "scaleway_instance_server" "main" {
 						image = "ubuntu_jammy"
 						type  = "PLAY2-PICO"
-						additional_volume_ids = [scaleway_block_volume.volume.id, scaleway_instance_volume.volume.id]
+						additional_volume_ids = [scaleway_block_volume.volume.id, scaleway_block_volume.bigger-volume.id]
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
 					resource.TestCheckResourceAttr("scaleway_instance_server.main", "additional_volume_ids.#", "2"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.0", "scaleway_block_volume.volume", "id"),
-					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.1", "scaleway_instance_volume.volume", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "additional_volume_ids.1", "scaleway_block_volume.bigger-volume", "id"),
 				),
 			},
 		},

internal/services/instance/server_test.go

@@ -10,6 +10,8 @@ import (
 )
 
 func TestAccDataSourceSnapshot_Basic(t *testing.T) {
+	t.Skip("Resources \"scaleway_instance_volume\" and \"scaleway_instance_snapshot\" are depracated")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 

internal/services/instance/snapshot_data_source_test.go

@@ -14,6 +14,8 @@ import (
 )
 
 func TestAccSnapshot_BlockVolume(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -111,6 +113,8 @@ func TestAccSnapshot_Server(t *testing.T) {
 }
 
 func TestAccSnapshot_ServerWithBlockVolume(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -153,6 +157,8 @@ func TestAccSnapshot_ServerWithBlockVolume(t *testing.T) {
 }
 
 func TestAccSnapshot_RenameSnapshot(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_snapshot\" is depracated for block volumes")
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -198,6 +204,9 @@ func TestAccSnapshot_RenameSnapshot(t *testing.T) {
 }
 
 func TestAccSnapshot_FromObject(t *testing.T) {
+	t.Skip("Resource \"scaleway_instance_snapshot\" is depracated")
+	// TestAccSnapshot_FromS3 tests the same logic on the scaleway_block_snapshot resource
+
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -217,7 +226,7 @@ func TestAccSnapshot_FromObject(t *testing.T) {
 						file   = "testfixture/empty.qcow2"
 					}
 
-					resource "scaleway_instance_snapshot" "snapshot" {
+					resource "scaleway_block_snapshot" "snapshot" {
 						name = "test-instance-snapshot-import-from-object"
 						type = "b_ssd"
 						import {