From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 896BB1FF16F for ; Tue, 2 Sep 2025 14:55:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2AD41335F; Tue, 2 Sep 2025 14:55:20 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 2 Sep 2025 14:55:13 +0200 Message-ID: <20250902125516.346145-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756817703293 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.075 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 Subject: [pve-devel] [PATCH manager] api: factor out shell command schema 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" So we only sort the enum keys once and the documentation and API dumps don't keep reordering them, and to deduplicate the cmd and cmd-opts schema. Signed-off-by: Wolfgang Bumiller --- PVE/API2/Nodes.pm | 68 ++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 48 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index ce7eecaf1..636789277 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -1103,6 +1103,23 @@ my $shell_cmd_map = { }, }; +my @shell_cmd_params = ( + cmd => { + type => 'string', + description => "Run specific command or default to login (requires 'root\@pam')", + enum => [sort keys %$shell_cmd_map], + optional => 1, + default => 'login', + }, + 'cmd-opts' => { + type => 'string', + description => "Add parameters to a command. Encoded as null terminated strings.", + requires => 'cmd', + optional => 1, + default => '', + }, +); + sub get_shell_command { my ($user, $shellcmd, $args) = @_; @@ -1156,22 +1173,7 @@ __PACKAGE__->register_method({ additionalProperties => 0, properties => { node => get_standard_option('pve-node'), - cmd => { - type => 'string', - description => - "Run specific command or default to login (requires 'root\@pam')", - enum => [keys %$shell_cmd_map], - optional => 1, - default => 'login', - }, - 'cmd-opts' => { - type => 'string', - description => - "Add parameters to a command. Encoded as null terminated strings.", - requires => 'cmd', - optional => 1, - default => '', - }, + @shell_cmd_params, websocket => { optional => 1, type => 'boolean', @@ -1307,22 +1309,7 @@ __PACKAGE__->register_method({ additionalProperties => 0, properties => { node => get_standard_option('pve-node'), - cmd => { - type => 'string', - description => - "Run specific command or default to login (requires 'root\@pam')", - enum => [keys %$shell_cmd_map], - optional => 1, - default => 'login', - }, - 'cmd-opts' => { - type => 'string', - description => - "Add parameters to a command. Encoded as null terminated strings.", - requires => 'cmd', - optional => 1, - default => '', - }, + @shell_cmd_params, }, }, returns => { @@ -1437,22 +1424,7 @@ __PACKAGE__->register_method({ properties => { node => get_standard_option('pve-node'), proxy => get_standard_option('spice-proxy', { optional => 1 }), - cmd => { - type => 'string', - description => - "Run specific command or default to login (requires 'root\@pam')", - enum => [keys %$shell_cmd_map], - optional => 1, - default => 'login', - }, - 'cmd-opts' => { - type => 'string', - description => - "Add parameters to a command. Encoded as null terminated strings.", - requires => 'cmd', - optional => 1, - default => '', - }, + @shell_cmd_params, }, }, returns => get_standard_option('remote-viewer-config'), -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel