Rename `--current-app` to `--app-package`

7 files changed, 27 insertions, 27 deletions

diff --git a/test/README.md b/test/README.md
index 07f223dac3..b0d37f7877 100644
--- a/test/README.md
+++ b/test/README.md
@@ -115,7 +115,7 @@ cargo run --bin test-manager run-vm debian11
 cargo run --bin test-manager run-tests debian11 \
     --display \
     --account 0123456789 \
-    --current-app <git hash or tag> \
+    --app-package <git hash or tag> \
     --previous-app 2023.2
 ```
 
@@ -141,7 +141,7 @@ cargo run --bin test-manager set macos-ventura tart ventura-base macos \
 cargo run --bin test-manager run-tests macos-ventura \
     --display \
     --account 0123456789 \
-    --current-app <git hash or tag> \
+    --app-package <git hash or tag> \
     --previous-app 2023.2
 ```
 
diff --git a/test/scripts/ssh-setup.sh b/test/scripts/ssh-setup.sh
index b3d358f5a0..7eb8ab56d3 100644
--- a/test/scripts/ssh-setup.sh
+++ b/test/scripts/ssh-setup.sh
@@ -6,7 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 
 RUNNER_DIR="$1"
-CURRENT_APP="$2"
+APP_PACKAGE="$2"
 PREVIOUS_APP="$3"
 UI_RUNNER="$4"
 
@@ -16,7 +16,7 @@ echo "Copying test-runner to $RUNNER_DIR"
 
 mkdir -p "$RUNNER_DIR"
 
-for file in test-runner connection-checker $CURRENT_APP $PREVIOUS_APP $UI_RUNNER openvpn.ca.crt; do
+for file in test-runner connection-checker $APP_PACKAGE $PREVIOUS_APP $UI_RUNNER openvpn.ca.crt; do
     echo "Moving $file to $RUNNER_DIR"
     cp -f "$SCRIPT_DIR/$file" "$RUNNER_DIR"
 done
diff --git a/test/test-manager/src/main.rs b/test/test-manager/src/main.rs
index c7363ca170..73942ca0cd 100644
--- a/test/test-manager/src/main.rs
+++ b/test/test-manager/src/main.rs
@@ -87,11 +87,11 @@ enum Commands {
         ///
         /// The gRPC interface must be compatible with the version specified for
         /// `mullvad-management-interface` in Cargo.toml.
-        #[arg(long, short)]
-        current_app: String,
+        #[arg(long)]
+        app_package: String,
 
         /// App package to upgrade from when running `test_install_previous_app`, can be left empty
-        /// if this test is not ran. Parsed the same way as `--current-app`.
+        /// if this test is not ran. Parsed the same way as `--app-package`.
         ///
         /// # Note
         ///
@@ -224,7 +224,7 @@ async fn main() -> Result<()> {
             display,
             vnc,
             account,
-            current_app,
+            app_package,
             previous_app,
             package_folder,
             test_filters,
@@ -261,7 +261,7 @@ async fn main() -> Result<()> {
             };
 
             let manifest =
-                package::get_app_manifest(vm_config, current_app, previous_app, package_folder)
+                package::get_app_manifest(vm_config, app_package, previous_app, package_folder)
                     .context("Could not find the specified app packages")?;
 
             let mut instance = vm::run(&config, &name)
@@ -284,8 +284,8 @@ async fn main() -> Result<()> {
                 tests::config::TestConfig {
                     account_number: account,
                     artifacts_dir,
-                    current_app_filename: manifest
-                        .current_app_path
+                    app_package_filename: manifest
+                        .app_package_path
                         .file_name()
                         .unwrap()
                         .to_string_lossy()
diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs
index 834716716d..3169d66221 100644
--- a/test/test-manager/src/package.rs
+++ b/test/test-manager/src/package.rs
@@ -9,7 +9,7 @@ static VERSION_REGEX: Lazy<Regex> =
 
 #[derive(Debug, Clone)]
 pub struct Manifest {
-    pub current_app_path: PathBuf,
+    pub app_package_path: PathBuf,
     pub previous_app_path: Option<PathBuf>,
     pub ui_e2e_tests_path: Option<PathBuf>,
 }
@@ -20,14 +20,14 @@ pub struct Manifest {
 /// TODO: If it's a git tag or rev, download it.
 pub fn get_app_manifest(
     config: &VmConfig,
-    current_app: String,
+    app_package: String,
     previous_app: Option<String>,
     package_folder: Option<PathBuf>,
 ) -> Result<Manifest> {
     let package_type = (config.os_type, config.package_type, config.architecture);
 
-    let current_app_path = find_app(&current_app, false, package_type, package_folder.as_ref())?;
-    log::info!("Current app: {}", current_app_path.display());
+    let app_package_path = find_app(&app_package, false, package_type, package_folder.as_ref())?;
+    log::info!("App package: {}", app_package_path.display());
 
     let previous_app_path = previous_app
         .map(|app| find_app(&app, false, package_type, package_folder.as_ref()))
@@ -35,17 +35,17 @@ pub fn get_app_manifest(
     log::info!("Previous app: {previous_app_path:?}");
 
     let capture = VERSION_REGEX
-        .captures(current_app_path.to_str().unwrap())
-        .with_context(|| format!("Cannot parse version: {}", current_app_path.display()))?
+        .captures(app_package_path.to_str().unwrap())
+        .with_context(|| format!("Cannot parse version: {}", app_package_path.display()))?
         .get(0)
         .map(|c| c.as_str())
-        .expect("Could not parse version from package name: {current_app}");
+        .expect("Could not parse version from package name: {app_package}");
 
     let ui_e2e_tests_path = find_app(capture, true, package_type, package_folder.as_ref()).ok();
     log::info!("GUI e2e test binary: {ui_e2e_tests_path:?}");
 
     Ok(Manifest {
-        current_app_path,
+        app_package_path,
         previous_app_path,
         ui_e2e_tests_path,
     })
diff --git a/test/test-manager/src/tests/config.rs b/test/test-manager/src/tests/config.rs
index 7fcc1e9f56..e845e1ab26 100644
--- a/test/test-manager/src/tests/config.rs
+++ b/test/test-manager/src/tests/config.rs
@@ -12,7 +12,7 @@ pub struct TestConfig {
     pub account_number: String,
 
     pub artifacts_dir: String,
-    pub current_app_filename: String,
+    pub app_package_filename: String,
     pub previous_app_filename: Option<String>,
     pub ui_e2e_tests_filename: Option<String>,
 
diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs
index 274ce173c2..4eae98d63a 100644
--- a/test/test-manager/src/tests/install.rs
+++ b/test/test-manager/src/tests/install.rs
@@ -108,7 +108,7 @@ pub async fn test_upgrade_app(ctx: TestContext, rpc: ServiceClient) -> anyhow::R
 
     // install new package
     log::debug!("Installing new app");
-    rpc.install_app(get_package_desc(&TEST_CONFIG.current_app_filename)?)
+    rpc.install_app(get_package_desc(&TEST_CONFIG.app_package_filename)?)
         .await?;
 
     // Give it some time to start
@@ -258,7 +258,7 @@ pub async fn test_install_new_app(_: TestContext, rpc: ServiceClient) -> anyhow:
 
     // install package
     log::debug!("Installing new app");
-    rpc.install_app(get_package_desc(&TEST_CONFIG.current_app_filename)?)
+    rpc.install_app(get_package_desc(&TEST_CONFIG.app_package_filename)?)
         .await?;
 
     // verify that daemon is running
@@ -313,7 +313,7 @@ pub async fn test_installation_idempotency(
     for _ in 0..2 {
         // Install the app
         log::info!("Installing new app");
-        let app_package = get_package_desc(&TEST_CONFIG.current_app_filename)?;
+        let app_package = get_package_desc(&TEST_CONFIG.app_package_filename)?;
         rpc.install_app(app_package).await?;
         log::info!("App was successfully installed!");
 
diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs
index 2f92b01511..abe827e098 100644
--- a/test/test-manager/src/vm/provision.rs
+++ b/test/test-manager/src/vm/provision.rs
@@ -115,7 +115,7 @@ fn blocking_ssh(
         .context("Failed to send connection-checker to remote")?;
 
     // Transfer app packages
-    ssh_send_file_path(&session, &local_app_manifest.current_app_path, temp_dir)
+    ssh_send_file_path(&session, &local_app_manifest.app_package_path, temp_dir)
         .context("Failed to send current app package to remote")?;
     if let Some(previous_app_path) = &local_app_manifest.previous_app_path {
         ssh_send_file_path(&session, previous_app_path, temp_dir)
@@ -155,8 +155,8 @@ fn blocking_ssh(
     .context("failed to send bootstrap script to remote")?;
 
     // Run setup script
-    let current_app_path = local_app_manifest
-        .current_app_path
+    let app_package_path = local_app_manifest
+        .app_package_path
         .file_name()
         .unwrap()
         .to_string_lossy();
@@ -170,7 +170,7 @@ fn blocking_ssh(
         .unwrap_or_default();
 
     let cmd = format!(
-        "sudo {} {remote_dir} \"{current_app_path}\" \"{previous_app_path}\" \"{ui_e2e_tests_path}\"",
+        "sudo {} {remote_dir} \"{app_package_path}\" \"{previous_app_path}\" \"{ui_e2e_tests_path}\"",
         dest.display()
     );
     log::debug!("Running setup script on remote, cmd: {cmd}");