[pmg-devel] [PATCH api 3/4] add PMG::NodeConfig::filter_domains_by_type helper
Wolfgang Bumiller
w.bumiller at proxmox.com
Wed Mar 17 11:02:15 CET 2021
for reuse
The private $filter_domains is still there to do the
in-place modification it did before.
Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
---
src/PMG/API2/Certificates.pm | 12 ++++--------
src/PMG/NodeConfig.pm | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm
index 775d575..b50addd 100644
--- a/src/PMG/API2/Certificates.pm
+++ b/src/PMG/API2/Certificates.pm
@@ -468,17 +468,13 @@ my $order_certificate = sub {
my $filter_domains = sub {
my ($acme_config, $type) = @_;
- my $domains = $acme_config->{domains};
- foreach my $domain (sort keys %$domains) {
- my $entry = $domains->{$domain};
- if (!(grep { $_ eq $type } PVE::Tools::split_list($entry->{usage}))) {
- delete $domains->{$domain};
- }
- }
+ my $domains = PMG::NodeConfig::filter_domains_by_type($acme_config->{domains}, $type);
- if (!%$domains) {
+ if (!$domains) {
raise("No domains configured for type '$type'\n", 400);
}
+
+ $acme_config->{domains} = $domains;
};
__PACKAGE__->register_method ({
diff --git a/src/PMG/NodeConfig.pm b/src/PMG/NodeConfig.pm
index 84c2141..19d23c3 100644
--- a/src/PMG/NodeConfig.pm
+++ b/src/PMG/NodeConfig.pm
@@ -222,4 +222,23 @@ sub get_acme_conf {
return $res;
}
+# Helper to filter the domains hash. Returns `undef` if the list is empty.
+sub filter_domains_by_type : prototype($$) {
+ my ($domains, $type) = @_;
+
+ return undef if !$domains || !%$domains;
+
+ my $out = {};
+
+ foreach my $domain (keys %$domains) {
+ my $entry = $domains->{$domain};
+ if (grep { $_ eq $type } PVE::Tools::split_list($entry->{usage})) {
+ $out->{$domain} = $entry;
+ }
+ }
+
+ return undef if !%$out;
+ return $out;
+}
+
1;
--
2.20.1
More information about the pmg-devel
mailing list