From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 12C161FF165 for <inbox@lore.proxmox.com>; Wed, 26 Feb 2025 16:01:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C3C1176BB; Wed, 26 Feb 2025 16:01:34 +0100 (CET) From: Stefan Hanreich <s.hanreich@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Wed, 26 Feb 2025 16:00:56 +0100 Message-Id: <20250226150057.232484-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.242 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [schema2rust.pm] Subject: [pdm-devel] [PATCH pve-api-types v2 1/2] generator: fix methods with url params but no query string X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> Commit 076b7f75 introduced a regression where endpoints that have URL parameters ('/url/with/{param}') would not get generated with format! calls. This causes URL endpoints such as get_task_status to fail, since those parameters do not get substituted. Add a helper for printing the URL that handles all cases and use the helper instead of generating the URL directly in the respective methods. Fixes: 076b7f75 ("generator: avoid useless format!() calls") Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com> --- pve-api-types/generator-lib/Schema2Rust.pm | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pve-api-types/generator-lib/Schema2Rust.pm b/pve-api-types/generator-lib/Schema2Rust.pm index 1ba21ed..29d1743 100644 --- a/pve-api-types/generator-lib/Schema2Rust.pm +++ b/pve-api-types/generator-lib/Schema2Rust.pm @@ -437,6 +437,18 @@ my sub return_expr : prototype($$) ($def, $expr) { return $expr; } +my sub print_url: prototype($$;$) { + my ($out, $def, $has_query) = @_; + + if ($has_query) { + print {$out} " let url = &format!(\"/api2/extjs$def->{url}\{query}\");\n"; + } elsif (defined($def->{url_params}) && $def->{url_params}->@*) { + print {$out} " let url = &format!(\"/api2/extjs$def->{url}\");\n"; + } else { + print {$out} " let url = \"/api2/extjs$def->{url}\";\n"; + } +} + my sub print_method_without_body : prototype($$$$$) { my ($out, $name, $def, $method, $trait) = @_; @@ -486,8 +498,8 @@ my sub print_method_without_body : prototype($$$$$) { print {$out} " add_query_arg(&mut query, &mut sep, \"$name\", &p_$rust_name);\n"; } } - print {$out} " let url = &format!(\"/api2/extjs$def->{url}\{query}\");\n"; - } elsif (defined($input = $def->{input})) { + print_url($out, $def, 1); + } elsif (defined($input = $def->{input}) && $input->@*) { for my $arg ($input->@*) { print {$out} " $arg->{rust_name}: $arg->{type},\n"; } @@ -510,9 +522,9 @@ my sub print_method_without_body : prototype($$$$$) { print {$out} " add_query_arg(&mut query, &mut sep, \"$name\", &$rust_name);\n"; } } - print {$out} " let url = &format!(\"/api2/extjs$def->{url}\{query}\");\n"; + print_url($out, $def, 1); } else { - print {$out} " let url = \"/api2/extjs$def->{url}\";\n"; + print_url($out, $def); } } else { print {$out} ") -> Result<$def->{output_type}, Error> {\n"; @@ -520,7 +532,8 @@ my sub print_method_without_body : prototype($$$$$) { print_default_impl($out, $name); return; } - print {$out} " let url = \"/api2/extjs$def->{url}\";\n"; + + print_url($out, $def); } my $call = return_expr($def, "self.0.$method(url).await?"); @@ -553,7 +566,7 @@ my sub print_method_with_body : prototype($$$$$) { return; } # print {$out} " // self.login().await?;\n"; - print {$out} " let url = \"/api2/extjs$def->{url}\";\n"; + print_url($out, $def); my $call = return_expr($def, "self.0.${method}(url, ¶ms).await?"); print {$out} " $call\n"; print {$out} "}\n\n"; -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel