From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A745E1FF141 for ; Tue, 02 Jun 2026 15:01:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 111C4138F2; Tue, 2 Jun 2026 15:01:08 +0200 (CEST) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox 2/5] pbs-api-types: use match statement for maintenance mode check Date: Tue, 2 Jun 2026 14:58:53 +0200 Message-ID: <20260602130001.217482-3-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260602130001.217482-1-r.obkircher@proxmox.com> References: <20260602130001.217482-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780405198999 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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 Message-ID-Hash: YEXHPGURO35PRUZCDYSERR6FPHGI57DH X-Message-ID-Hash: YEXHPGURO35PRUZCDYSERR6FPHGI57DH X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use an exhaustive match statement to be more explicit and to draw attention when new variants are added. Signed-off-by: Robert Obkircher --- pbs-api-types/src/maintenance.rs | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs index 2adb5d84..7def498b 100644 --- a/pbs-api-types/src/maintenance.rs +++ b/pbs-api-types/src/maintenance.rs @@ -94,25 +94,22 @@ impl MaintenanceMode { } pub fn check(&self, operation: Operation) -> Result<(), Error> { - if self.ty == MaintenanceType::Delete { - bail!("datastore is being deleted"); - } - let message = percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or("")) .decode_utf8() .unwrap_or(Cow::Borrowed("")); - if Operation::Lookup == operation { - return Ok(()); - } else if self.ty == MaintenanceType::Unmount { - bail!("datastore is being unmounted"); - } else if self.ty == MaintenanceType::Offline { - bail!("offline maintenance mode: {}", message); - } else if self.ty == MaintenanceType::S3Refresh { - bail!("S3 refresh maintenance mode: {}", message); - } else if self.ty == MaintenanceType::ReadOnly && Operation::Write == operation { - bail!("read-only maintenance mode: {}", message); + match (self.ty, operation) { + (MaintenanceType::Delete, _) => bail!("datastore is being deleted"), + (_, Operation::Lookup) => Ok(()), + (MaintenanceType::Unmount, _) => bail!("datastore is being unmounted"), + (MaintenanceType::Offline, _) => bail!("offline maintenance mode: {message}"), + (MaintenanceType::S3Refresh, _) => bail!("S3 refresh maintenance mode: {message}"), + (MaintenanceType::ReadOnly, Operation::Read) => Ok(()), + (MaintenanceType::ReadOnly, Operation::Write) => { + bail!("read-only maintenance mode: {message}") + } + #[cfg(feature = "enum-fallback")] + (MaintenanceType::UnknownEnumValue(_), _) => Ok(()), } - Ok(()) } } -- 2.47.3