fix(is_instance): ensure user-tags on volume_prototype are correctly set (IBM-Cloud#6279)

* fix(is_instance): ensure user-tags on volume_prototype are correctly set

* Added acceptance tests

Author: uibm

ibm/service/vpc/resource_ibm_is_instance.go

@@ -8844,6 +8844,11 @@ func setVolumePrototypesInState(d *schema.ResourceData, instance *vpcv1.Instance
 					vol["volume_name"] = *volumeRef.Name
 					vol["volume_profile"] = *volumeRef.Profile.Name
 					vol["volume_iops"] = *volumeRef.Iops
+					tags := make([]interface{}, len(volumeRef.UserTags))
+					for i, v := range volumeRef.UserTags {
+						tags[i] = v
+					}
+					vol["volume_tags"] = schema.NewSet(schema.HashString, tags)
 					vol["volume_capacity"] = *volumeRef.Capacity
 					vol["volume_bandwidth"] = volumeRef.Bandwidth
 					vol["volume_crn"] = *volume.Volume.CRN

ibm/service/vpc/resource_ibm_is_instance_test.go

@@ -4325,3 +4325,137 @@ func testAccCheckIBMISInstanceConfigWithProfileAndBandwidth(vpcname, subnetname,
 		wait_before_delete = false
 	}`, vpcname, subnetname, acc.ISZoneName, acc.ISCIDR, sshname, publicKey, name, acc.IsImage, profile, bandwidth, prefix, acc.ISZoneName)
 }
+
+// volume tags
+
+func TestAccIBMISInstance_volumeTags(t *testing.T) {
+	var instance string
+	prefix := fmt.Sprintf("tf-inst-%d", acctest.RandIntRange(10, 100))
+	vpcname := fmt.Sprintf("%s-vpc", prefix)
+	name := fmt.Sprintf("%s-instance", prefix)
+	subnetname := fmt.Sprintf("%s-subnet", prefix)
+	sshname := fmt.Sprintf("%s-ssh", prefix)
+	dataVolumeName := fmt.Sprintf("%s-data-volume", prefix)
+
+	publicKey := strings.TrimSpace(`
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEGGaXOYllPYQE+Qj8MiRo7DOJK9j7K8OQE9VWL5VjZ terraform-test-key
+`)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { acc.TestAccPreCheck(t) },
+		Providers:    acc.TestAccProviders,
+		CheckDestroy: testAccCheckIBMISInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMISInstanceVolumeTagsConfig(prefix, vpcname, subnetname, sshname, publicKey, name, dataVolumeName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIBMISInstanceExists("ibm_is_instance.testacc_instance", instance),
+					// Instance checks
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "name", name),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "profile", "bx2-2x8"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "zone", acc.ISZoneName),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "tags.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "tags.0", "tagged:byuser"),
+
+					// Volume prototype checks
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.volume_name", dataVolumeName),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.volume_capacity", "141"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.volume_profile", "general-purpose"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.delete_volume_on_instance_delete", "true"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.volume_tags.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "volume_prototypes.0.volume_tags.0", "tagged:byuser"),
+
+					// Boot volume checks
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "boot_volume.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "boot_volume.0.tags.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "boot_volume.0.tags.0", "tagged:byuser"),
+					resource.TestCheckResourceAttrSet("ibm_is_instance.testacc_instance", "boot_volume.0.volume_id"),
+
+					// Primary network attachment checks
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "primary_network_attachment.#", "1"),
+					resource.TestCheckResourceAttr("ibm_is_instance.testacc_instance", "primary_network_attachment.0.name", fmt.Sprintf("%s-pna", prefix)),
+					resource.TestCheckResourceAttrSet("ibm_is_instance.testacc_instance", "primary_network_attachment.0.virtual_network_interface.0.subnet"),
+
+					// Data source checks for boot volume tags
+					resource.TestCheckResourceAttr("data.ibm_is_volume.boot", "tags.0", "tagged:byuser"),
+					// Data source checks for data volume tags
+					resource.TestCheckResourceAttr("data.ibm_is_volume.data", "tags.0", "tagged:byuser"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckIBMISInstanceVolumeTagsConfig(prefix, vpcname, subnetname, sshname, publicKey, name, dataVolumeName string) string {
+	return fmt.Sprintf(`
+	# VPC Infrastructure
+	resource "ibm_is_vpc" "is_vpc" {
+		name = "%s"
+	}
+
+	resource "ibm_is_subnet" "is_subnet" {
+		name                     = "%s"
+		vpc                      = ibm_is_vpc.is_vpc.id
+		total_ipv4_address_count = 64
+		zone                     = "%s"
+	}
+
+	# Data sources
+	data "ibm_is_image" "is_image" {
+		name = "ibm-ubuntu-20-04-6-minimal-amd64-6"
+	}
+
+	# SSH Key
+	resource "ibm_is_ssh_key" "is_key" {
+		name       = "%s"
+		public_key = "%s"
+		type       = "ed25519"
+	}
+
+	# Instance with tagged volumes
+	resource "ibm_is_instance" "testacc_instance" {
+		name    = "%s"
+		image   = data.ibm_is_image.is_image.id
+		profile = "bx2-2x8"
+		
+		primary_network_attachment {
+			name = "%s-pna"
+			virtual_network_interface {
+				subnet = ibm_is_subnet.is_subnet.id
+			}
+		}
+		
+		# Boot volume with tags
+		boot_volume {
+			tags = ["tagged:byuser"]
+		}
+
+		# Data volume with tags
+		volume_prototypes {
+			name                             = "%s"
+			delete_volume_on_instance_delete = true
+			volume_name                      = "%s"
+			volume_capacity                  = 141
+			volume_profile                   = "general-purpose"
+			volume_tags                      = ["tagged:byuser"]
+		}
+		
+		vpc                = ibm_is_vpc.is_vpc.id
+		zone               = ibm_is_subnet.is_subnet.zone
+		keys               = [ibm_is_ssh_key.is_key.id]
+		wait_before_delete = false
+		
+		tags = ["tagged:byuser"]
+	}
+
+	# Data sources to verify volume tags
+	data "ibm_is_volume" "boot" {
+		identifier = ibm_is_instance.testacc_instance.boot_volume.0.volume_id
+	}
+
+	data "ibm_is_volume" "data" {
+		name = ibm_is_instance.testacc_instance.volume_prototypes.0.volume_name
+	}
+	`, vpcname, subnetname, acc.ISZoneName, sshname, publicKey, name, prefix, dataVolumeName, dataVolumeName)
+}