Improved minor naming convention & docs

ibm/acctest/acctest.go

@@ -1093,6 +1093,7 @@ func init() {
 		Pi_shared_processor_pool_id = "tf-pi-shared-processor-pool"
 		fmt.Println("[WARN] Set the environment variable PI_SHARED_PROCESSOR_POOL_ID for testing ibm_pi_shared_processor_pool resource else it is set to default value 'tf-pi-shared-processor-pool'")
 	}
+
 	Pi_target_storage_tier = os.Getenv("PI_TARGET_STORAGE_TIER")
 	if Pi_target_storage_tier == "" {
 		Pi_target_storage_tier = "terraform-test-tier"
@@ -1101,8 +1102,10 @@ func init() {
 
 	Pi_volume_clone_task_id = os.Getenv("PI_VOLUME_CLONE_TASK_ID")
 	if Pi_volume_clone_task_id == "" {
-		Pi_volume_clone_task_id = "terraform-test-tier"
-		fmt.Println("[INFO] Set the environment variable PI_VOLUME_CLONE_TASK_ID for testing Pi_volume_clone_task_id resource else it is set to default value 'terraform-test-tier'")
+		Pi_volume_clone_task_id = "terraform-test-volume-clone-task-id"
+		fmt.Println("[INFO] Set the environment variable PI_VOLUME_CLONE_TASK_ID for testing Pi_volume_clone_task_id resource else it is set to default value 'terraform-test-volume-clone-task-id'")
+	}
+
 	Pi_resource_group_id = os.Getenv("PI_RESOURCE_GROUP_ID")
 	if Pi_resource_group_id == "" {
 		Pi_resource_group_id = ""

ibm/service/power/data_source_ibm_pi_volume_clone.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2023 All Rights Reserved.
+// Copyright IBM Corp. 2023, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package power
@@ -64,8 +64,10 @@ func dataSourceIBMPIVolumeCloneRead(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	d.SetId(PIVolumeCloneTaskID)
-	d.Set("volume_clone_status", volClone.Status)
+	d.SetId(d.Get(PIVolumeCloneTaskID).(string))
+	if volClone.Status != nil {
+		d.Set("volume_clone_status", *volClone.Status)
+	}
 	d.Set("volume_clone_failure_reason", volClone.FailedReason)
 	if volClone.PercentComplete != nil {
 		d.Set("volume_clone_percent_complete", *volClone.PercentComplete)

ibm/service/power/data_source_ibm_pi_volume_clone_test.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2023 All Rights Reserved.
+// Copyright IBM Corp. 2023, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package power_test
@@ -31,8 +31,8 @@ func TestAccIBMPIVolumeClone_basic(t *testing.T) {
 func testAccCheckIBMPIVolumeCloneBasicConfig() string {
 	return fmt.Sprintf(`
 data "ibm_pi_volume_clone" "testacc_ds_volume_clone" {
-    pi_volume_clone_task_id   	= "%s"
-    pi_cloud_instance_id 		= "%s"
+    pi_volume_clone_task_id		= "%s"
+    pi_cloud_instance_id		= "%s"
 }`, acc.Pi_volume_clone_task_id, acc.Pi_cloud_instance_id)
 
 }

ibm/service/power/ibm_pi_constants.go

@@ -145,16 +145,16 @@ const (
 
 	// status
 	// common status states
-	StatusShutoff        = "SHUTOFF"
-	StatusActive         = "ACTIVE"
-	StatusResize         = "RESIZE"
-	StatusError          = "ERROR"
-	StatusBuild          = "BUILD"
-	StatusPending        = "PENDING"
-	SctionStart          = "start"
-	SctionStop           = "stop"
-	PIVolumeCloneDone    = "completed"
-	PIVolumeCloneRunning = "running"
+	StatusShutoff          = "SHUTOFF"
+	StatusActive           = "ACTIVE"
+	StatusResize           = "RESIZE"
+	StatusError            = "ERROR"
+	StatusBuild            = "BUILD"
+	StatusPending          = "PENDING"
+	SctionStart            = "start"
+	SctionStop             = "stop"
+	PIVolumeCloneCompleted = "completed"
+	PIVolumeCloneRunning   = "running"
 
 	// Workspaces
 	Attr_WorkspaceCapabilities = "pi_workspace_capabilities"

ibm/service/power/resource_ibm_pi_volume_clone.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2023 All Rights Reserved.
+// Copyright IBM Corp. 2023, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package power
@@ -110,8 +110,8 @@ func resourceIBMPIVolumeCloneCreate(ctx context.Context, d *schema.ResourceData,
 		body.TargetStorageTier = v.(string)
 	}
 
-	if v, ok := d.GetOk(helpers.PIReplicationEnabled); ok {
-		value := v.(bool)
+	if !d.GetRawConfig().GetAttr(helpers.PIReplicationEnabled).IsNull() {
+		value := d.Get(helpers.PIReplicationEnabled).(bool)
 		body.TargetReplicationEnabled = &value
 	}
 
@@ -150,7 +150,9 @@ func resourceIBMPIVolumeCloneRead(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	d.Set("volume_clone_task_id", vcTaskID)
-	d.Set("volume_clone_status", volCloneTask.Status)
+	if volCloneTask.Status != nil {
+		d.Set("volume_clone_status", *volCloneTask.Status)
+	}
 	d.Set("volume_clone_failure_reason", volCloneTask.FailedReason)
 	if volCloneTask.PercentComplete != nil {
 		d.Set("volume_clone_percent_complete", *volCloneTask.PercentComplete)
@@ -186,7 +188,7 @@ func isWaitForIBMPIVolumeCloneCompletion(ctx context.Context, client *st.IBMPICl
 
 	stateConf := &resource.StateChangeConf{
 		Pending:    []string{PIVolumeCloneRunning},
-		Target:     []string{PIVolumeCloneDone},
+		Target:     []string{PIVolumeCloneCompleted},
 		Refresh:    isIBMPIVolumeCloneRefreshFunc(client, id),
 		Delay:      10 * time.Second,
 		MinTimeout: 2 * time.Minute,
@@ -203,8 +205,8 @@ func isIBMPIVolumeCloneRefreshFunc(client *st.IBMPICloneVolumeClient, id string)
 			return nil, "", err
 		}
 
-		if *volClone.Status == PIVolumeCloneDone {
-			return volClone, PIVolumeCloneDone, nil
+		if *volClone.Status == PIVolumeCloneCompleted {
+			return volClone, PIVolumeCloneCompleted, nil
 		}
 
 		return volClone, PIVolumeCloneRunning, nil

ibm/service/power/resource_ibm_pi_volume_clone_test.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2023 All Rights Reserved.
+// Copyright IBM Corp. 2023, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package power_test