cmd, test/system: Deprecate containers using o.fd.Flatpak.SessionHelper

#1684

Author: DaliborKr

src/cmd/run.go

@@ -256,7 +256,7 @@ func runCommand(container string,
 	if entryPoint != "toolbox" {
 		var builder strings.Builder
 		fmt.Fprintf(&builder, "container %s is too old and no longer supported\n", container)
-		fmt.Fprintf(&builder, "Recreate it with Toolbx version 0.0.17 or newer.")
+		fmt.Fprintf(&builder, "Recreate it with Toolbx version 0.0.97 or newer.")
 
 		errMsg := builder.String()
 		return errors.New(errMsg)
@@ -529,6 +529,9 @@ func callFlatpakSessionHelper(container podman.Container) error {
 		return nil
 	}
 
+	fmt.Fprintf(os.Stderr, "Warning: container %s uses deprecated features\n", name)
+	fmt.Fprintf(os.Stderr, "Consider recreating it with Toolbox version 0.0.97 or newer.\n")
+
 	if _, err := utils.CallFlatpakSessionHelper(); err != nil {
 		return err
 	}

test/system/104-run.bats

@@ -316,6 +316,21 @@ teardown() {
   assert [ ${#stderr_lines[@]} -eq 0 ]
 }
 
+@test "run: Ensure that containers using o.fd.Flatpak.SessionHelper are deprecated" {
+  local container="deprecated"
+
+  create_container_flatpak_session_helper "$container"
+
+  run --keep-empty-lines --separate-stderr "$TOOLBX" run --container "$container" true
+
+  assert_success
+  assert [ ${#lines[@]} -eq 0 ]
+  lines=("${stderr_lines[@]}")
+  assert_line --index 0 "Warning: container $container uses deprecated features"
+  assert_line --index 1 "Consider recreating it with Toolbox version 0.0.97 or newer."
+  assert [ ${#stderr_lines[@]} -eq 2 ]
+}
+
 @test "run: Try the non-existent default container with none other present" {
   local default_container_name
   default_container_name="$(get_system_id)-toolbox-$(get_system_version)"
@@ -860,6 +875,6 @@ teardown() {
   assert [ ${#lines[@]} -eq 0 ]
   lines=("${stderr_lines[@]}")
   assert_line --index 0 "Error: container $container is too old and no longer supported"
-  assert_line --index 1 "Recreate it with Toolbx version 0.0.17 or newer."
+  assert_line --index 1 "Recreate it with Toolbx version 0.0.97 or newer."
   assert [ ${#stderr_lines[@]} -eq 2 ]
 }

test/system/libs/helpers.bash

@@ -577,3 +577,56 @@ function is_fedora_rawhide() (
 
   return 0
 )
+
+
+# Creates a container with org.freedesktop.Flatpak.SessionHelper D-Bus interface
+#
+# Pulling of an image is taken care of by the function
+#
+# Parameters:
+# ===========
+# - container_name - name of the container
+function create_container_flatpak_session_helper() (
+  local container_name="$1"
+
+  local default_image
+  default_image="$(get_default_image)"
+
+  pull_default_image
+
+  gdbus call \
+    --session \
+    --dest org.freedesktop.Flatpak \
+    --object-path /org/freedesktop/Flatpak/SessionHelper \
+    --method org.freedesktop.Flatpak.SessionHelper.RequestSession
+
+  podman_cmd=(
+      podman create \
+          --dns none \
+          --env TOOLBOX_PATH="$TOOLBX" \
+          --name "$container_name" \
+          --network host \
+          --no-hosts \
+          --pid host \
+          --privileged \
+          --userns=keep-id \
+          --user root:root \
+          --volume "$HOME":"$HOME":rslave \
+          --volume "$TOOLBX":/usr/bin/toolbox \
+          --volume "$XDG_RUNTIME_DIR":"$XDG_RUNTIME_DIR" \
+          --volume "$XDG_RUNTIME_DIR/.flatpak-helper/monitor":/run/host/monitor \
+          --volume /etc:/run/host/etc \
+          --volume /usr:/run/host/usr:rslave \
+          "$default_image" \
+          toolbox init-container \
+                  --home "$HOME" \
+                  --shell "$SHELL" \
+                  --uid "$(id -ru)" \
+                  --user "$USER"
+    )
+
+    # Print the full command
+    # printf "%q " "${podman_cmd[@]}" >> /tmp/toolbox_podman_command.log
+
+    "${podman_cmd[@]}" || fail "Podman couldn't create container '$container_name'"
+)