From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CE2A6FC06 for ; Mon, 24 Jul 2023 15:51:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A8C09F747 for ; Mon, 24 Jul 2023 15:50:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 24 Jul 2023 15:50:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DA1F8425F4 for ; Mon, 24 Jul 2023 15:50:30 +0200 (CEST) Date: Mon, 24 Jul 2023 15:50:30 +0200 From: Wolfgang Bumiller To: Lukas Wagner Cc: pve-devel@lists.proxmox.com Message-ID: References: <20230720143236.652292-1-l.wagner@proxmox.com> <20230720143236.652292-56-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230720143236.652292-56-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.117 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v4 pve-manager 55/69] api: notification: disallow removing targets if they are used X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2023 13:51:01 -0000 On Thu, Jul 20, 2023 at 04:32:22PM +0200, Lukas Wagner wrote: > Check notification targets configured in datacenter.cfg and jobs.cfg, > failing if the group/endpoint to be removed is still in use there. > > Signed-off-by: Lukas Wagner > --- > PVE/API2/Cluster/Notifications.pm | 44 ++++++++++++++++++++++++++++++- > 1 file changed, 43 insertions(+), 1 deletion(-) > > diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm > index fa2c1d9d..cf913452 100644 > --- a/PVE/API2/Cluster/Notifications.pm > +++ b/PVE/API2/Cluster/Notifications.pm > @@ -6,6 +6,7 @@ use strict; > use Storable qw(dclone); > use JSON; > > +use PVE::Exception qw(raise_param_exc); > use PVE::Tools qw(extract_param); > use PVE::JSONSchema qw(get_standard_option); > use PVE::RESTHandler; > @@ -55,6 +56,31 @@ sub raise_api_error { > die $exc; > } > > +sub target_used_by { > + my ($target) = @_; > + > + my $used_by = []; > + > + # Check keys in datacenter.cfg > + my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); > + for my $key (qw(target-package-updates target-replication target-fencing)) { > + if ($dc_conf->{notify} && $dc_conf->{notify}->{$key} eq $target) { > + push @$used_by, $key; > + } > + } > + > + # Check backup jobs > + my $jobs_conf = PVE::Cluster::cfs_read_file('jobs.cfg'); I'm not exactly a big fan of requiring a function to know all the places that might declare notification targets, but I suppose for now this is "good enough". If more of these get added we might need a better way, for instance we could give other packages a way to register callbacks to collect this information... > + for my $key (keys %{$jobs_conf->{ids}}) { > + my $job = $jobs_conf->{ids}->{$key}; > + if ($job->{'notification-target'} eq $target) { > + push @$used_by, $key; > + } > + } > + > + return join(', ', @$used_by); > +} > + > __PACKAGE__->register_method ({ > name => 'index', > path => '',