gsadmin/PSProxmoxVE
1
0
Fork 0
mirror of https://github.com/GoodOlClint/PSProxmoxVE.git synced 2026-09-07 12:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: route the storage cmdlets through StorageService (#126) (#203)

Browse Source 
* refactor: route the storage cmdlets through StorageService (#126)

New-PveStorage, Invoke-PveStorageDownload and Send-PveFile each built
their own PveHttpClient. They now call StorageService, which already
had CreateStorage/DownloadUrl/UploadIso with zero callers.

StorageService.UploadIso previously hardcoded content=iso regardless
of the cmdlet's ContentType parameter (iso/vztmpl/import), which would
have silently broken vztmpl/import uploads on conversion; it now takes
an optional contentType parameter. DownloadUrl gained an optional
timeout parameter so Invoke-PveStorageDownload -TimeoutSeconds keeps
working, matching UploadIso's existing default. Per issue #194, both
cmdlets construct a fresh StorageService() with no injected client so
the timeout override reaches PveServiceBase.CreateClient instead of
being silently dropped.

ParseTask now stamps Status = "running" on the UPID-string branch,
matching what the cmdlets stamped locally before conversion (same
rule PR #196 established for SnapshotService).

* test: add StorageService coverage for the #126 storage seam

---------

Co-authored-by: goodolclint-claude[bot] <323206664+goodolclint-claude[bot]@users.noreply.github.com>
This commit is contained in:
goodolclint-claude[bot]
2026-09-03 00:15:41 +00:00
committed by GitHub
parent 283dc47658
commit b43948b696
5 changed files with 312 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PSProxmoxVE.Core/Services/StorageService.cs
+21 -6
View File
@@ -102,6 +102,9 @@ namespace PSProxmoxVE.Core.Services
/// HTTP timeout override for this upload. Defaults to 30 minutes, overriding the
/// session's default 100-second timeout so that large files have time to transfer.
/// </param>
/// <param name="contentType">
/// The storage content type to upload as (e.g. "iso", "vztmpl", "import"). Defaults to "iso".
/// </param>
public PveTask UploadIso(
PveSession session,
string node,
@@ -110,16 +113,18 @@ namespace PSProxmoxVE.Core.Services
string? checksum = null,
string? checksumAlgorithm = null,
Action<long, long>? progressCallback = null,
TimeSpan? timeout = null)
TimeSpan? timeout = null,
string contentType = "iso")
{
if (session == null) throw new ArgumentNullException(nameof(session));
if (string.IsNullOrWhiteSpace(node)) throw new ArgumentNullException(nameof(node));
if (string.IsNullOrWhiteSpace(storage)) throw new ArgumentNullException(nameof(storage));
if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentNullException(nameof(filePath));
if (string.IsNullOrWhiteSpace(contentType)) throw new ArgumentNullException(nameof(contentType));
var formFields = new Dictionary<string, string>
{
["content"] = "iso"
["content"] = contentType
};
return Invoke(session, timeout ?? TimeSpan.FromMinutes(30), client =>
@@ -145,13 +150,19 @@ namespace PSProxmoxVE.Core.Services
/// <param name="url">The URL to download from.</param>
/// <param name="filename">The target filename on the storage.</param>
/// <param name="contentType">The content type (e.g. "iso", "vztmpl").</param>
/// <param name="timeout">
/// HTTP timeout override for this request. Defaults to 30 minutes, matching
/// <see cref="UploadIso"/>, since scheduling a download can outlast the session's
/// default 100-second timeout on a slow or busy node.
/// </param>
public PveTask DownloadUrl(
PveSession session,
string node,
string storage,
string url,
string filename,
string contentType)
string contentType,
TimeSpan? timeout = null)
{
if (session == null) throw new ArgumentNullException(nameof(session));
if (string.IsNullOrWhiteSpace(node)) throw new ArgumentNullException(nameof(node));
@@ -167,7 +178,7 @@ namespace PSProxmoxVE.Core.Services
["content"] = contentType
};
return Invoke(session, client =>
return Invoke(session, timeout ?? TimeSpan.FromMinutes(30), client =>
{
var response = client.PostAsync($"nodes/{Uri.EscapeDataString(node)}/storage/{Uri.EscapeDataString(storage)}/download-url", formData)
.GetAwaiter().GetResult();
@@ -196,8 +207,12 @@ namespace PSProxmoxVE.Core.Services
kvp => kvp.Key,
kvp => kvp.Value?.ToString() ?? string.Empty);
var response = client.PostAsync("storage", formData).GetAwaiter().GetResult();
if (string.IsNullOrWhiteSpace(response))
return new PveStorage();
var data = JObject.Parse(response)["data"];
return data?.ToObject<PveStorage>() ?? new PveStorage();
return data?.Type == JTokenType.Object
? data.ToObject<PveStorage>() ?? new PveStorage()
: new PveStorage();
});
}
@@ -334,7 +349,7 @@ namespace PSProxmoxVE.Core.Services
{
var data = JObject.Parse(response)["data"];
if (data?.Type == JTokenType.String)
return new PveTask { Upid = data.ToString(), Node = node };
return new PveTask { Upid = data.ToString(), Node = node, Status = "running" };
var task = data?.ToObject<PveTask>() ?? new PveTask();
task.Node = node;
src/PSProxmoxVE/Cmdlets/Storage/InvokePveStorageDownloadCmdlet.cs
+3 -22
View File
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Management.Automation;
using Newtonsoft.Json.Linq;
using PSProxmoxVE.Core.Client;
using PSProxmoxVE.Core.Models.Vms;
using PSProxmoxVE.Core.Services;
@@ -73,28 +70,12 @@ namespace PSProxmoxVE.Cmdlets.Storage
{
timeout = TimeSpan.FromMinutes(30);
}
using var client = new PveHttpClient(session, timeout);
WriteVerbose($"Downloading '{Url}' to {Node}/{Storage}...");
var resource = $"nodes/{Uri.EscapeDataString(Node)}/storage/{Uri.EscapeDataString(Storage)}/download-url";
var data = new Dictionary<string, string>
{
["url"] = Url,
["filename"] = Filename,
["content"] = ContentType
};
var task = new StorageService().DownloadUrl(session, Node, Storage, Url, Filename, ContentType, timeout);
var json = client.PostAsync(resource, data).GetAwaiter().GetResult();
var root = JObject.Parse(json);
var upid = root["data"]?.ToString() ?? string.Empty;
var task = new PveTask { Upid = upid, Node = Node, Status = "running" };
if (Wait.IsPresent && !string.IsNullOrEmpty(upid))
{
var taskService = new TaskService();
task = taskService.WaitForTask(session, Node, upid);
}
if (Wait.IsPresent && !string.IsNullOrEmpty(task.Upid))
task = new TaskService().WaitForTask(session, Node, task.Upid);
WriteObject(task);
}
src/PSProxmoxVE/Cmdlets/Storage/NewPveStorageCmdlet.cs
+4 -7
View File
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Management.Automation;
using Newtonsoft.Json.Linq;
using PSProxmoxVE.Core.Client;
using PSProxmoxVE.Core.Models.Storage;
using PSProxmoxVE.Core.Services;
namespace PSProxmoxVE.Cmdlets.Storage
{
@@ -84,7 +83,7 @@ namespace PSProxmoxVE.Cmdlets.Storage
[Parameter(Mandatory = false, HelpMessage = "Limit access to these nodes (comma-separated).")]
public string? Nodes { get; set; }
private static void AddIfNotEmpty(Dictionary<string, string> data, string key, string? value)
private static void AddIfNotEmpty(Dictionary<string, object> data, string key, string? value)
{
if (!string.IsNullOrEmpty(value))
data[key] = value!;
@@ -104,10 +103,9 @@ namespace PSProxmoxVE.Cmdlets.Storage
}
var session = GetSession();
using var client = new PveHttpClient(session);
WriteVerbose($"Creating storage '{Storage}'...");
var data = new Dictionary<string, string>
var data = new Dictionary<string, object>
{
["storage"] = Storage,
["type"] = Type
@@ -145,9 +143,8 @@ namespace PSProxmoxVE.Cmdlets.Storage
if (Shared.IsPresent) data["shared"] = "1";
if (Disable.IsPresent) data["disable"] = "1";
client.PostAsync("storage", data).GetAwaiter().GetResult();
new StorageService().CreateStorage(session, data);
// Return the storage object representing what was created
var storage = new PveStorage
{
Storage = Storage,
src/PSProxmoxVE/Cmdlets/Storage/SendPveFileCmdlet.cs
+11 -22
View File
@@ -1,8 +1,6 @@
using System;
using System.IO;
using System.Management.Automation;
using Newtonsoft.Json.Linq;
using PSProxmoxVE.Core.Client;
using PSProxmoxVE.Core.Models.Vms;
using PSProxmoxVE.Core.Services;
@@ -95,10 +93,8 @@ namespace PSProxmoxVE.Cmdlets.Storage
{
timeout = TimeSpan.FromMinutes(30);
}
using var client = new PveHttpClient(session, timeout);
WriteVerbose($"Uploading {fileName} to {Node}/{Storage} (content={ContentType})...");
var resource = $"nodes/{Uri.EscapeDataString(Node)}/storage/{Uri.EscapeDataString(Storage)}/upload";
var totalBytes = new System.IO.FileInfo(Path).Length;
var activityId = 1;
@@ -111,18 +107,19 @@ namespace PSProxmoxVE.Cmdlets.Storage
// callback directly would invoke it from the HTTP serialization thread
// and cause PowerShell to throw an InvalidOperationException mid-upload.
long progressBytes = 0;
var storageService = new StorageService();
var uploadTask = System.Threading.Tasks.Task.Run(() =>
client.UploadFileAsync(
resource,
storageService.UploadIso(
session,
Node,
Storage,
Path,
formFields: new System.Collections.Generic.Dictionary<string, string>
{
["content"] = ContentType
},
checksum: Checksum,
checksumAlgorithm: ChecksumAlgorithm,
progressCallback: (bytesSent, _) =>
System.Threading.Interlocked.Exchange(ref progressBytes, bytesSent)));
System.Threading.Interlocked.Exchange(ref progressBytes, bytesSent),
timeout: timeout,
contentType: ContentType));
// Poll progress on the pipeline thread while the upload runs.
while (!uploadTask.IsCompleted)
@@ -138,21 +135,13 @@ namespace PSProxmoxVE.Cmdlets.Storage
}
}
var json = uploadTask.GetAwaiter().GetResult();
var task = uploadTask.GetAwaiter().GetResult();
progressRecord.RecordType = ProgressRecordType.Completed;
WriteProgress(progressRecord);
var root = JObject.Parse(json);
var upid = root["data"]?.ToString() ?? string.Empty;
var task = new PveTask { Upid = upid, Node = Node, Status = "running" };
if (Wait.IsPresent && !string.IsNullOrEmpty(upid))
{
var taskService = new TaskService();
task = taskService.WaitForTask(session, Node, upid);
}
if (Wait.IsPresent && !string.IsNullOrEmpty(task.Upid))
task = new TaskService().WaitForTask(session, Node, task.Upid);
WriteObject(task);
}