reordered logic to update

Author: uibm

ibm/service/vpc/resource_ibm_is_instance_boot_volume_manager.go

@@ -455,10 +455,6 @@ func instancebootvolUpdate(d *schema.ResourceData, meta interface{}) error {
 		delete = true
 	}
 
-	if d.HasChange(isVolumeName) {
-		name = d.Get(isVolumeName).(string)
-		hasNameChanged = true
-	}
 	var capacity int64
 	if delete {
 		deleteAllInstanceBootSnapshots(sess, id)
@@ -498,26 +494,6 @@ func instancebootvolUpdate(d *schema.ResourceData, meta interface{}) error {
 	}
 	options.IfMatch = &eTag
 
-	//name update
-	volumeNamePatchModel := &vpcv1.VolumePatch{}
-	if hasNameChanged {
-		volumeNamePatchModel.Name = &name
-		volumeNamePatch, err := volumeNamePatchModel.AsPatch()
-		if err != nil {
-			return fmt.Errorf("[ERROR] Error calling asPatch for volumeNamePatch in Instance boot volume : %s", err)
-		}
-		options.VolumePatch = volumeNamePatch
-		_, response, err = sess.UpdateVolume(options)
-		eTag = response.Headers.Get("ETag")
-		if err != nil {
-			return err
-		}
-		_, err = isWaitForInstanceBootVolumeManagerAvailable(sess, d.Id(), d.Timeout(schema.TimeoutCreate), &eTag)
-		if err != nil {
-			return err
-		}
-	}
-
 	// profile/ iops update
 	if d.HasChange(isVolumeProfileName) || d.HasChange(isVolumeIops) {
 		volumeProfilePatchModel := &vpcv1.VolumePatch{}
@@ -678,6 +654,30 @@ func instancebootvolUpdate(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
+	//name update
+	if d.HasChange(isVolumeName) {
+		name = d.Get(isVolumeName).(string)
+		hasNameChanged = true
+	}
+	volumeNamePatchModel := &vpcv1.VolumePatch{}
+	if hasNameChanged {
+		volumeNamePatchModel.Name = &name
+		volumeNamePatch, err := volumeNamePatchModel.AsPatch()
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error calling asPatch for volumeNamePatch in Instance boot volume : %s", err)
+		}
+		options.VolumePatch = volumeNamePatch
+		_, response, err = sess.UpdateVolume(options)
+		eTag = response.Headers.Get("ETag")
+		if err != nil {
+			return err
+		}
+		_, err = isWaitForInstanceBootVolumeManagerAvailable(sess, d.Id(), d.Timeout(schema.TimeoutCreate), &eTag)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }