fix(instance): image: remove MaxItems on additional volumes + fix doc

Author: Mia-Cross

docs/resources/instance_image.md

@@ -69,7 +69,7 @@ resource "scaleway_instance_snapshot" "server_snapshot" {
 resource "scaleway_instance_image" "image" {
   name           = "image_with_extra_volumes"
   root_volume_id = scaleway_instance_snapshot.server_snapshot.id
-  additional_volumes = [
+  additional_volume_ids = [
     scaleway_instance_snapshot.volume_snapshot.id
   ]
 }
@@ -83,9 +83,6 @@ The following arguments are supported:
 - `name` - (Optional) The name of the image. If not provided it will be randomly generated.
 - `architecture` - (Optional, default `x86_64`) The architecture the image is compatible with. Possible values are: `x86_64` or `arm`.
 - `additional_volume_ids` - (Optional) List of IDs of the snapshots of the additional volumes to be attached to the image.
-
--> **Important:** For now it is only possible to have 1 additional_volume.
-
 - `tags` - (Optional) A list of tags to apply to the image.
 - `public` - (Optional) Set to `true` if the image is public.
 - `zone` - (Defaults to provider `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the image should be created.

internal/services/instance/image.go

@@ -59,7 +59,6 @@ func ResourceImage() *schema.Resource {
 			"additional_volume_ids": {
 				Type:     schema.TypeList,
 				Optional: true,
-				MaxItems: 1,
 				Elem: &schema.Schema{
 					Type:             schema.TypeString,
 					ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(),

internal/services/instance/image_test.go

@@ -131,44 +131,41 @@ func TestAccImage_ExternalBlockVolume(t *testing.T) {
 						size_in_gb = 50
 						iops = 5000
 					}
-
-					resource "scaleway_block_snapshot" "main" {
-						volume_id = scaleway_block_volume.main.id
-					}
-				`,
-			},
-			{
-				Config: `
-					resource "scaleway_block_volume" "main" {
+					resource "scaleway_block_volume" "additional1" {
 						size_in_gb = 50
 						iops = 5000
 					}
-
-					resource "scaleway_block_volume" "additional1" {
+					resource "scaleway_block_volume" "additional2" {
 						size_in_gb = 50
 						iops = 5000
 					}
 
 					resource "scaleway_block_snapshot" "main" {
 						volume_id = scaleway_block_volume.main.id
 					}
-
 					resource "scaleway_block_snapshot" "additional1" {
 						volume_id = scaleway_block_volume.additional1.id
 					}
+					resource "scaleway_block_snapshot" "additional2" {
+						volume_id = scaleway_block_volume.additional2.id
+					}
 
 					resource "scaleway_instance_image" "main" {
 						name 			= "tf-test-image-external-block-volume"
 						root_volume_id 	= scaleway_block_snapshot.main.id
-						additional_volume_ids = [scaleway_block_snapshot.additional1.id]
+						additional_volume_ids = [
+							scaleway_block_snapshot.additional1.id,
+							scaleway_block_snapshot.additional2.id
+						]
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					instancechecks.DoesImageExists(tt, "scaleway_instance_image.main"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "root_volume_id", "scaleway_block_snapshot.main", "id"),
 					resource.TestCheckResourceAttr("scaleway_instance_image.main", "architecture", "x86_64"),
-					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volume_ids.#", "1"),
+					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volume_ids.#", "2"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "additional_volume_ids.0", "scaleway_block_snapshot.additional1", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "additional_volume_ids.1", "scaleway_block_snapshot.additional2", "id"),
 				),
 			},
 			{
@@ -177,19 +174,24 @@ func TestAccImage_ExternalBlockVolume(t *testing.T) {
 						size_in_gb = 50
 						iops = 5000
 					}
-
 					resource "scaleway_block_volume" "additional1" {
 						size_in_gb = 50
 						iops = 5000
 					}
+					resource "scaleway_block_volume" "additional2" {
+						size_in_gb = 50
+						iops = 5000
+					}
 
 					resource "scaleway_block_snapshot" "main" {
 						volume_id = scaleway_block_volume.main.id
 					}
-
 					resource "scaleway_block_snapshot" "additional1" {
 						volume_id = scaleway_block_volume.additional1.id
 					}
+					resource "scaleway_block_snapshot" "additional2" {
+						volume_id = scaleway_block_volume.additional2.id
+					}
 
 					resource "scaleway_instance_image" "main" {
 						name 			= "tf-test-image-external-block-volume"
@@ -458,27 +460,15 @@ func TestAccImage_ServerWithLocalVolume(t *testing.T) {
 							volume_type = "l_ssd"
 						}
 					}
-					resource "scaleway_instance_snapshot" "local01" {
-						volume_id = scaleway_instance_server.server01.root_volume.0.volume_id
-						depends_on = [ scaleway_instance_server.server01 ]
-					}
-				`,
-				Check: resource.ComposeTestCheckFunc(
-					isServerPresent(tt, "scaleway_instance_server.server01"),
-					isSnapshotPresent(tt, "scaleway_instance_snapshot.local01"),
-				),
-			},
-			{
-				Config: `
-					resource "scaleway_instance_server" "server01" {
+					resource "scaleway_instance_server" "server02" {
 						image	= "ubuntu_focal"
 						type 	= "DEV1-S"
 						root_volume {
-							size_in_gb = 15
+							size_in_gb = 10
 							volume_type = "l_ssd"
 						}
 					}
-					resource "scaleway_instance_server" "server02" {
+					resource "scaleway_instance_server" "server03" {
 						image	= "ubuntu_focal"
 						type 	= "DEV1-S"
 						root_volume {
@@ -489,18 +479,21 @@ func TestAccImage_ServerWithLocalVolume(t *testing.T) {
 
 					resource "scaleway_instance_snapshot" "local01" {
 						volume_id = scaleway_instance_server.server01.root_volume.0.volume_id
-						depends_on = [ scaleway_instance_server.server01 ]
 					}
 					resource "scaleway_instance_snapshot" "local02" {
 						volume_id = scaleway_instance_server.server02.root_volume.0.volume_id
-						depends_on = [ scaleway_instance_server.server02 ]
+					}
+					resource "scaleway_instance_snapshot" "local03" {
+						volume_id = scaleway_instance_server.server03.root_volume.0.volume_id
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isServerPresent(tt, "scaleway_instance_server.server01"),
 					isServerPresent(tt, "scaleway_instance_server.server02"),
+					isServerPresent(tt, "scaleway_instance_server.server03"),
 					isSnapshotPresent(tt, "scaleway_instance_snapshot.local01"),
 					isSnapshotPresent(tt, "scaleway_instance_snapshot.local02"),
+					isSnapshotPresent(tt, "scaleway_instance_snapshot.local03"),
 				),
 			},
 			{
@@ -521,33 +514,43 @@ func TestAccImage_ServerWithLocalVolume(t *testing.T) {
 							volume_type = "l_ssd"
 						}
 					}
+					resource "scaleway_instance_server" "server03" {
+						image	= "ubuntu_focal"
+						type 	= "DEV1-S"
+						root_volume {
+							size_in_gb = 10
+							volume_type = "l_ssd"
+						}
+					}
 
 					resource "scaleway_instance_snapshot" "local01" {
 						volume_id = scaleway_instance_server.server01.root_volume.0.volume_id
-						depends_on = [ scaleway_instance_server.server01 ]
 					}
 					resource "scaleway_instance_snapshot" "local02" {
 						volume_id = scaleway_instance_server.server02.root_volume.0.volume_id
-						depends_on = [ scaleway_instance_server.server02 ]
+					}
+					resource "scaleway_instance_snapshot" "local03" {
+						volume_id = scaleway_instance_server.server03.root_volume.0.volume_id
 					}
 
 					resource "scaleway_instance_image" "main" {
 						root_volume_id 	= scaleway_instance_snapshot.local01.id
-						additional_volume_ids = [ scaleway_instance_snapshot.local02.id ]
-						depends_on = [
-							scaleway_instance_snapshot.local01,
-							scaleway_instance_snapshot.local02,
+						additional_volume_ids = [
+							scaleway_instance_snapshot.local02.id,
+							scaleway_instance_snapshot.local03.id
 						]
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					isServerPresent(tt, "scaleway_instance_server.server01"),
-					isServerPresent(tt, "scaleway_instance_server.server02"),
 					isSnapshotPresent(tt, "scaleway_instance_snapshot.local01"),
 					isSnapshotPresent(tt, "scaleway_instance_snapshot.local02"),
+					isSnapshotPresent(tt, "scaleway_instance_snapshot.local03"),
 					instancechecks.DoesImageExists(tt, "scaleway_instance_image.main"),
 					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "root_volume_id", "scaleway_instance_snapshot.local01", "id"),
-					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "additional_volumes.0.id", "scaleway_instance_snapshot.local02", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "additional_volumes.1.id", "scaleway_instance_snapshot.local02", "id"),
+					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volumes.1.volume_type", "l_ssd"),
+					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volumes.1.size", "10000000000"),
+					resource.TestCheckResourceAttrPair("scaleway_instance_image.main", "additional_volumes.0.id", "scaleway_instance_snapshot.local03", "id"),
 					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volumes.0.volume_type", "l_ssd"),
 					resource.TestCheckResourceAttr("scaleway_instance_image.main", "additional_volumes.0.size", "10000000000"),
 				),

internal/services/instance/server.go

@@ -289,7 +289,7 @@ func ResourceServer() *schema.Resource {
 				Type:        schema.TypeMap,
 				Optional:    true,
 				Computed:    true,
-				Description: "The user data associated with the server", // TODO: document reserved keys (`cloud-init`)
+				Description: "The user data associated with the server",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},