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 DBD63736E1; Fri, 18 Jun 2021 10:21:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF10C24D47; Fri, 18 Jun 2021 10:21:11 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0739824D31; Fri, 18 Jun 2021 10:21:10 +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 CB6FE44204; Fri, 18 Jun 2021 10:21:09 +0200 (CEST) Date: Fri, 18 Jun 2021 10:21:02 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: pbs-devel@lists.proxmox.com, Proxmox VE development discussion References: <20210611114418.28772-1-f.ebner@proxmox.com> <20210611114418.28772-20-f.ebner@proxmox.com> In-Reply-To: <20210611114418.28772-20-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1624004317.hqvtt7y32a.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.769 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [apt.rs, proxmox.com] Subject: Re: [pve-devel] [PATCH v6 proxmox-backup 5/6] add upgrade_repositories call 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: Fri, 18 Jun 2021 08:21:11 -0000 On June 11, 2021 1:44 pm, Fabian Ebner wrote: > Signed-off-by: Fabian Ebner > --- >=20 > Note that the release_upgrade function is available with proxmox-apt 0.1.= 1 > (but disabled) so this can be applied to the master branch as well. >=20 > Changes from v5: > * limit to Superuser instead of SYS_MODIFY > * use new/renamed release_upgrade function from library. > * error if not all files could be parsed not that important for the current use case, but.. we might want to add=20 a lockfile for reading/writing the repo files? if we ever add=20 full-fledged editing capabilities.. it's also reading/parsing multiple=20 files, so a write might intermingle with that and cause inconsistent=20 reads (first few files old, latter files updated).. >=20 > src/api2/node/apt.rs | 53 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 53 insertions(+) >=20 > diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs > index deb481a7..861bc32b 100644 > --- a/src/api2/node/apt.rs > +++ b/src/api2/node/apt.rs > @@ -509,6 +509,58 @@ pub fn get_repositories() -> Result { > })) > } > =20 > +#[api( > + input: { > + properties: { > + node: { > + schema: NODE_SCHEMA, > + }, > + digest: { > + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, > + optional: true, > + }, > + }, > + }, > + protected: true, > + access: { > + permission: &Permission::Superuser, > + }, > +)] > +/// Upgrade the repository configuration for the next major release. > +pub fn upgrade_repositories(digest: Option) -> Result<(), Error>= { > + let (mut files, errors) =3D proxmox_apt::repositories::repositories(= )?; > + > + if files.len() =3D=3D 0 { > + bail!("no APT repository files could be parsed!"); > + } > + > + if errors.len() > 0 { > + let message =3D errors.iter().fold( > + "Problem parsing file(s):".to_string(), > + |message, error| format!("{}\n{}", message, error), > + ); > + bail!(message); > + } > + > + if let Some(digest) =3D digest { > + let expected_digest =3D proxmox::tools::hex_to_digest(&digest)?; > + let current_digest =3D proxmox_apt::repositories::common_digest(= &files); > + crate::tools::detect_modified_configuration_file(¤t_digest= , &expected_digest)?; > + } > + > + proxmox_apt::repositories::release_upgrade(&mut files)?; > + > + if let Err(errors) =3D proxmox_apt::repositories::write_repositories= (&files) { > + let message =3D errors.iter().fold( > + "Problem writing file(s):".to_string(), > + |message, error| format!("{}\n{}", message, error), > + ); > + bail!(message); > + } > + > + Ok(()) > +} > + > const SUBDIRS: SubdirMap =3D &[ > ("changelog", &Router::new().get(&API_METHOD_APT_GET_CHANGELOG)), > ("checkrepositories", &Router::new().get(&API_METHOD_CHECK_REPOSITOR= IES)), > @@ -517,6 +569,7 @@ const SUBDIRS: SubdirMap =3D &[ > .get(&API_METHOD_APT_UPDATE_AVAILABLE) > .post(&API_METHOD_APT_UPDATE_DATABASE) > ), > + ("upgraderepositories", &Router::new().put(&API_METHOD_UPGRADE_REPOS= ITORIES)), > ("versions", &Router::new().get(&API_METHOD_GET_VERSIONS)), > ]; > =20 > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20