[pve-devel] [PATCH storage v3 2/4] tree-wide: make use of content type assertion helper

[Daniel Kral]

Make any code path with an existent content type assertion use the newly
introduced content type assertion helper.

Where possible, existing calls to `storage_check_enabled()` can be
lowered to calls to `storage_config()` as the former subroutine is
already called in the helper already.

Also the other code path, where there was no call to
`storage_check_enabled()` before, does not break the existing API,
because it did actions on the storage anyway and would fail on an
unavailable storage.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
changes since v2:
  * rename helper from *_supported to *_available
  * lower storage_check_enabled to storage_config where possible due to
    the helper already checking that

 src/PVE/API2/Storage/Status.pm | 10 ++++------
 src/PVE/Storage.pm             |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index 14915ae..3a929d8 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -439,7 +439,7 @@ __PACKAGE__->register_method ({
 	my $cfg = PVE::Storage::config();
 
 	my ($node, $storage) = $param->@{qw(node storage)};
-	my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node);
+	my $scfg = PVE::Storage::storage_config($cfg, $storage);
 
 	die "can't upload to storage type '$scfg->{type}'\n"
 	    if !defined($scfg->{path});
@@ -485,8 +485,7 @@ __PACKAGE__->register_method ({
 	    raise_param_exc({ content => "upload content type '$content' not allowed" });
 	}
 
-	die "storage '$storage' does not support '$content' content\n"
-	    if !$scfg->{content}->{$content};
+	PVE::Storage::assert_content_type_available($cfg, $storage, $content, $node);
 
 	my $dest = "$path/$filename";
 	my $dirname = dirname($dest);
@@ -663,15 +662,14 @@ __PACKAGE__->register_method({
 	my $cfg = PVE::Storage::config();
 
 	my ($node, $storage, $compression) = $param->@{qw(node storage compression)};
-	my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node);
+	my $scfg = PVE::Storage::storage_config($cfg, $storage);
 
 	die "can't upload to storage type '$scfg->{type}', not a file based storage!\n"
 	    if !defined($scfg->{path});
 
 	my ($content, $url) = $param->@{'content', 'url'};
 
-	die "storage '$storage' is not configured for content-type '$content'\n"
-	    if !$scfg->{content}->{$content};
+	PVE::Storage::assert_content_type_available($cfg, $storage, $content, $node);
 
 	my $filename = PVE::Storage::normalize_content_filename($param->{filename});
 
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index b5a2c8a..eea51e9 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -1842,7 +1842,8 @@ sub prune_backups {
     my ($cfg, $storeid, $keep, $vmid, $type, $dryrun, $logfunc) = @_;
 
     my $scfg = storage_config($cfg, $storeid);
-    die "storage '$storeid' does not support backups\n" if !$scfg->{content}->{backup};
+
+    PVE::Storage::assert_content_type_available($cfg, $storeid, 'backup');
 
     if (!defined($keep)) {
 	die "no prune-backups options configured for storage '$storeid'\n"
-- 
2.39.5