chore: make subnet selection arg consistent (#187)

Author: viviveevee

crates/icp-cli/src/commands/deploy/mod.rs

@@ -25,9 +25,9 @@ pub(crate) struct DeployArgs {
     #[arg(long, short, default_value = "auto", value_parser = ["auto", "install", "reinstall", "upgrade"])]
     pub(crate) mode: String,
 
-    /// The subnet id to use for the canisters being deployed.
+    /// The subnet to use for the canisters being deployed.
     #[clap(long)]
-    pub(crate) subnet_id: Option<Principal>,
+    pub(crate) subnet: Option<Principal>,
 
     /// One or more controllers for the canisters being deployed. Repeat `--controller` to specify multiple.
     #[arg(long)]
@@ -146,7 +146,7 @@ pub(crate) async fn exec(ctx: &Context, args: &DeployArgs) -> Result<(), Command
 
             quiet: false,
             cycles: args.cycles,
-            subnet: args.subnet_id,
+            subnet: args.subnet,
         },
     )
     .await?;

crates/icp-cli/tests/canister_delete_tests.rs

@@ -45,7 +45,7 @@ fn canister_delete() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/canister_info_tests.rs

@@ -46,7 +46,7 @@ fn canister_status() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/canister_settings_tests.rs

@@ -59,7 +59,7 @@ fn canister_settings_update_controllers() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",
@@ -363,7 +363,7 @@ fn canister_settings_update_log_visibility() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",
@@ -678,7 +678,7 @@ fn canister_settings_update_miscellaneous() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--cycles",
             &format!("{}", 120 * TRILLION), // 120 TCYCLES because compute allocation is expensive
@@ -801,7 +801,7 @@ fn canister_settings_update_environment_variables() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/canister_start_tests.rs

@@ -49,7 +49,7 @@ fn canister_start() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/canister_status_tests.rs

@@ -49,7 +49,7 @@ fn canister_status() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/canister_stop_tests.rs

@@ -48,7 +48,7 @@ fn canister_stop() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/deploy_tests.rs

@@ -28,7 +28,7 @@ fn deploy_empty() {
     // Deploy project
     ctx.icp()
         .current_dir(&project_dir)
-        .args(["deploy", "--subnet-id", common::SUBNET_ID])
+        .args(["deploy", "--subnet", common::SUBNET_ID])
         .assert()
         .success();
 }
@@ -55,7 +55,7 @@ fn deploy_canister_not_found() {
     // Deploy project
     ctx.icp()
         .current_dir(&project_dir)
-        .args(["deploy", "my-canister", "--subnet-id", common::SUBNET_ID])
+        .args(["deploy", "my-canister", "--subnet", common::SUBNET_ID])
         .assert()
         .failure()
         .stderr(eq("Error: project does not contain a canister named 'my-canister'").trim());
@@ -101,7 +101,7 @@ async fn deploy() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",
@@ -166,7 +166,7 @@ async fn deploy_twice_should_succeed() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",
@@ -179,7 +179,7 @@ async fn deploy_twice_should_succeed() {
         .current_dir(&project_dir)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "my-environment",

crates/icp-cli/tests/network_tests.rs

@@ -181,7 +181,7 @@ fn deploy_to_other_projects_network() {
         .current_dir(&projb)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "environment-1",
@@ -194,7 +194,7 @@ fn deploy_to_other_projects_network() {
         .current_dir(&projb)
         .args([
             "deploy",
-            "--subnet-id",
+            "--subnet",
             common::SUBNET_ID,
             "--environment",
             "environment-1",

crates/icp-cli/tests/project_tests.rs

@@ -189,7 +189,7 @@ fn glob_path() {
 //     // Invoke build
 //     ctx.icp()
 //         .current_dir(project_dir)
-//         .args(["deploy", "--subnet-id", common::SUBNET_ID])
+//         .args(["deploy", "--subnet", common::SUBNET_ID])
 //         .assert()
 //         .failure()
 //         .stderr(eq("Error: cannot redefine the 'ic' network; the network path 'networks/ic' is invalid").trim());