From c8b9fc7d6798adb0b666db4b19c40f4430ba8105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 28 Mar 2024 12:22:54 -0400 Subject: [PATCH] Revert "[lxd-import] client/storage_volumes: Update calls to queryOperation." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 99aab483f8e9290217801b679ee4a6a38f40156c. Part of #292 Signed-off-by: Stéphane Graber --- client/incus_storage_volumes.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/client/incus_storage_volumes.go b/client/incus_storage_volumes.go index 0d13139fde0..12809a05549 100644 --- a/client/incus_storage_volumes.go +++ b/client/incus_storage_volumes.go @@ -231,7 +231,7 @@ func (r *ProtocolIncus) CreateStoragePoolVolumeSnapshot(pool string, volumeType url.PathEscape(pool), url.PathEscape(volumeType), url.PathEscape(volumeName)) - op, _, err := r.queryOperation("POST", path, snapshot, "", true) + op, _, err := r.queryOperation("POST", path, snapshot, "") if err != nil { return nil, err } @@ -308,7 +308,7 @@ func (r *ProtocolIncus) RenameStoragePoolVolumeSnapshot(pool string, volumeType path := fmt.Sprintf("/storage-pools/%s/volumes/%s/%s/snapshots/%s", url.PathEscape(pool), url.PathEscape(volumeType), url.PathEscape(volumeName), url.PathEscape(snapshotName)) // Send the request - op, _, err := r.queryOperation("POST", path, snapshot, "", true) + op, _, err := r.queryOperation("POST", path, snapshot, "") if err != nil { return nil, err } @@ -327,7 +327,7 @@ func (r *ProtocolIncus) DeleteStoragePoolVolumeSnapshot(pool string, volumeType "/storage-pools/%s/volumes/%s/%s/snapshots/%s", url.PathEscape(pool), url.PathEscape(volumeType), url.PathEscape(volumeName), url.PathEscape(snapshotName)) - op, _, err := r.queryOperation("DELETE", path, nil, "", true) + op, _, err := r.queryOperation("DELETE", path, nil, "") if err != nil { return nil, err } @@ -343,7 +343,7 @@ func (r *ProtocolIncus) UpdateStoragePoolVolumeSnapshot(pool string, volumeType // Send the request path := fmt.Sprintf("/storage-pools/%s/volumes/%s/%s/snapshots/%s", url.PathEscape(pool), url.PathEscape(volumeType), url.PathEscape(volumeName), url.PathEscape(snapshotName)) - _, _, err := r.queryOperation("PUT", path, volume, ETag, true) + _, _, err := r.queryOperation("PUT", path, volume, ETag) if err != nil { return err } @@ -386,7 +386,7 @@ func (r *ProtocolIncus) MigrateStoragePoolVolume(pool string, volume api.Storage } // Send the request - op, _, err := r.queryOperation("POST", path, req, "", true) + op, _, err := r.queryOperation("POST", path, req, "") if err != nil { return nil, err } @@ -475,7 +475,7 @@ func (r *ProtocolIncus) tryCreateStoragePoolVolume(pool string, req api.StorageV // Send the request path := fmt.Sprintf("/storage-pools/%s/volumes/%s", url.PathEscape(pool), url.PathEscape(req.Type)) - top, _, err := r.queryOperation("POST", path, req, "", true) + top, _, err := r.queryOperation("POST", path, req, "") if err != nil { errors = append(errors, remoteOperationResult{URL: serverURL, Error: err}) continue @@ -573,7 +573,7 @@ func (r *ProtocolIncus) CopyStoragePoolVolume(pool string, source InstanceServer } // Send the request - op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/%s", url.PathEscape(pool), url.PathEscape(volume.Type)), req, "", true) + op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/%s", url.PathEscape(pool), url.PathEscape(volume.Type)), req, "") if err != nil { return nil, err } @@ -622,7 +622,7 @@ func (r *ProtocolIncus) CopyStoragePoolVolume(pool string, source InstanceServer path := fmt.Sprintf("/storage-pools/%s/volumes/%s", url.PathEscape(pool), url.PathEscape(volume.Type)) // Send the request - op, _, err := r.queryOperation("POST", path, req, "", true) + op, _, err := r.queryOperation("POST", path, req, "") if err != nil { return nil, err } @@ -674,7 +674,7 @@ func (r *ProtocolIncus) CopyStoragePoolVolume(pool string, source InstanceServer path := fmt.Sprintf("/storage-pools/%s/volumes/%s", url.PathEscape(pool), url.PathEscape(volume.Type)) // Send the request - targetOp, _, err := r.queryOperation("POST", path, req, "", true) + targetOp, _, err := r.queryOperation("POST", path, req, "") if err != nil { return nil, err } @@ -742,7 +742,7 @@ func (r *ProtocolIncus) MoveStoragePoolVolume(pool string, source InstanceServer } // Send the request - op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/%s/%s", url.PathEscape(sourcePool), url.PathEscape(volume.Type), volume.Name), req, "", true) + op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/%s/%s", url.PathEscape(sourcePool), url.PathEscape(volume.Type), volume.Name), req, "") if err != nil { return nil, err } @@ -872,7 +872,7 @@ func (r *ProtocolIncus) CreateStoragePoolVolumeBackup(pool string, volName strin } // Send the request - op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups", url.PathEscape(pool), url.PathEscape(volName)), backup, "", true) + op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups", url.PathEscape(pool), url.PathEscape(volName)), backup, "") if err != nil { return nil, err } @@ -887,7 +887,7 @@ func (r *ProtocolIncus) RenameStoragePoolVolumeBackup(pool string, volName strin } // Send the request - op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups/%s", url.PathEscape(pool), url.PathEscape(volName), url.PathEscape(name)), backup, "", true) + op, _, err := r.queryOperation("POST", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups/%s", url.PathEscape(pool), url.PathEscape(volName), url.PathEscape(name)), backup, "") if err != nil { return nil, err } @@ -902,7 +902,7 @@ func (r *ProtocolIncus) DeleteStoragePoolVolumeBackup(pool string, volName strin } // Send the request - op, _, err := r.queryOperation("DELETE", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups/%s", url.PathEscape(pool), url.PathEscape(volName), url.PathEscape(name)), nil, "", true) + op, _, err := r.queryOperation("DELETE", fmt.Sprintf("/storage-pools/%s/volumes/custom/%s/backups/%s", url.PathEscape(pool), url.PathEscape(volName), url.PathEscape(name)), nil, "") if err != nil { return nil, err }