Fixes #23780: Implement missing commands (#5198)

Normation · Nov 28, 2023 · 283e81c · 283e81c
1 parent 72e9c95
commit 283e81c
Show file tree

Hide file tree

Showing 23 changed files with 1,299 additions and 395 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -154,7 +154,7 @@ pipeline {
                                 sh script: 'typos', label: 'check webapp api doc typos'
                             }
                             dir('relay') {
-                                sh script: 'typos --exclude "*.asc" --exclude "*.pem" --exclude "*.cert" --exclude "*.priv" --exclude "*.pub" --exclude "*.signed" --exclude "*.log" --exclude "*.json"', label: 'check relayd typos'
+                                sh script: 'typos --exclude "*.license" --exclude "*.asc" --exclude "*.pem" --exclude "*.cert" --exclude "*.priv" --exclude "*.pub" --exclude "*.signed" --exclude "*.log" --exclude "*.json"', label: 'check relayd typos'
                             }
                         }
                     }

diff --git a/relay/sources/Makefile b/relay/sources/Makefile
@@ -118,9 +118,10 @@ install: build
 	# rudder-package new implementation
 	install -m 755 rudder-package/target/release/rudder-package $(DESTDIR)/opt/rudder/bin/rudder-package
 	install -m 755 rudder-package/tools/rudder_plugins_key.gpg $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder_plugins_key.gpg
+	install -m 755 rudder-package/tools/rudder-package.sh $(DESTDIR)/opt/rudder/share/commands/package
 	install -m 755 rudder-pkg/rudder-pkg.conf $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder-pkg.conf
 	# rudder-pkg kept as backup for now
-	install -m 755 rudder-pkg/rudder-pkg $(DESTDIR)/opt/rudder/share/commands/package
+	install -m 755 rudder-pkg/rudder-pkg $(DESTDIR)/opt/rudder/share/python/rudder-pkg/rudder-pkg
 	ln -ns ../share/commands/package $(DESTDIR)/opt/rudder/bin/rudder-pkg
 	install -m 755 rudder-pkg/rudder_plugins_key.pub $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder_plugins_key.pub
 	install -m 644 autocomplete/rudder-pkg.sh $(DESTDIR)/etc/bash_completion.d/

diff --git a/relay/sources/rudder-package/Cargo.lock b/relay/sources/rudder-package/Cargo.lock
diff --git a/relay/sources/rudder-package/Cargo.toml b/relay/sources/rudder-package/Cargo.toml
@@ -33,6 +33,8 @@ tar = "0.4.40"
 tempfile = "3.8.0"
 which = "5.0.0"
 flate2 = "1.0.28"
+cli-table = "0.4.7"
+spinners = "4.1.1"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch,

diff --git a/relay/sources/rudder-package/Dockerfile b/relay/sources/rudder-package/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.72.0-bullseye
+FROM rust:1.74.0-bullseye
 LABEL ci=rudder/relay/sources/rudder-package/Dockerfile
 
 ARG USER_ID=1000

diff --git a/relay/sources/rudder-package/rust-toolchain.toml b/relay/sources/rudder-package/rust-toolchain.toml
@@ -1,3 +1,2 @@
 [toolchain]
-channel = "1.72.0"
-
+channel = "1.74.0"