removed computed from encryption_key and added encryption_type for is_volume

ibm/data_source_ibm_is_volume.go

@@ -49,6 +49,12 @@ func dataSourceIBMISVolume() *schema.Resource {
 				Description: "Volume encryption key info",
 			},
 
+			isVolumeEncryptionType: {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Volume encryption type info",
+			},
+
 			isVolumeCapacity: {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -201,6 +207,9 @@ func volumeGet(d *schema.ResourceData, meta interface{}, name string) error {
 		if vol.EncryptionKey != nil {
 			d.Set(isVolumeEncryptionKey, vol.EncryptionKey.CRN)
 		}
+		if vol.Encryption != nil {
+			d.Set(isVolumeEncryptionType, vol.Encryption)
+		}
 		if vol.SourceSnapshot != nil {
 			d.Set(isVolumeSourceSnapshot, *vol.SourceSnapshot.ID)
 		}

ibm/resource_ibm_is_volume.go

@@ -21,6 +21,7 @@ const (
 	isVolumeProfileName          = "profile"
 	isVolumeZone                 = "zone"
 	isVolumeEncryptionKey        = "encryption_key"
+	isVolumeEncryptionType       = "encryption_type"
 	isVolumeCapacity             = "capacity"
 	isVolumeIops                 = "iops"
 	isVolumeCrn                  = "crn"
@@ -84,11 +85,16 @@ func resourceIBMISVolume() *schema.Resource {
 			isVolumeEncryptionKey: {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Computed:    true,
 				ForceNew:    true,
 				Description: "Volume encryption key info",
 			},
 
+			isVolumeEncryptionType: {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Volume encryption type info",
+			},
+
 			isVolumeCapacity: {
 				Type:        schema.TypeInt,
 				Optional:    true,
@@ -333,6 +339,9 @@ func volGet(d *schema.ResourceData, meta interface{}, id string) error {
 	if vol.EncryptionKey != nil {
 		d.Set(isVolumeEncryptionKey, vol.EncryptionKey.CRN)
 	}
+	if vol.Encryption != nil {
+		d.Set(isVolumeEncryptionType, vol.Encryption)
+	}
 	d.Set(isVolumeIops, *vol.Iops)
 	d.Set(isVolumeCapacity, *vol.Capacity)
 	d.Set(isVolumeCrn, *vol.CRN)

website/docs/d/is_volume.html.markdown

@@ -35,6 +35,7 @@ In addition to all argument reference list, you can access the following attribu
 
 - `capacity` - (String) The capacity of the volume in gigabytes.
 - `encryption_key` - (String) The key to use for encrypting this volume.
+- `encryption_type` - (String) The type of ecryption used in the volume [**provider_managed**, **user_managed**].
 - `iops` - (String) The bandwidth for the volume.
 - `profile` - (String) The profile to use for this volume.
 - `resource_group` - (String) The resource group ID for this volume.

website/docs/r/is_volume.html.markdown

@@ -59,6 +59,7 @@ Review the argument references that you can specify for your resource.
 ## Attribute reference
 In addition to all argument reference list, you can access the following attribute reference after your resource is created.
 
+- `encryption_type` - (String) The type of ecryption used in the volume [**provider_managed**, **user_managed**].
 - `id` - (String) The unique identifier of the volume.
 - `source_snapshot` - ID of the snapshot, if volume was created from it.
 - `status` - (String) The status of volume. Supported values are **available**, **failed**, **pending**, **unusable**, or **pending_deletion**.