From d8ff64c1d90753459d056f452325456afddfb92b Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Tue, 16 Jan 2024 03:25:57 -0800
Subject: [PATCH] difference between assign and use public ip

---
 Cargo.lock                        | 4 ++--
 bin/core/src/cloud/aws.rs         | 3 ++-
 client/rs/src/api/write/launch.rs | 2 ++
 client/rs/src/entities/builder.rs | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 66eb55201..a9db07e32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2959,9 +2959,9 @@ dependencies = [
 
 [[package]]
 name = "serror"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eefe7ba3cfc7e288ae60ca1e2ba2104acabb96dcadb9ec40ece559876529a163"
+checksum = "9e07f96f2a8cc7225cf79027fb2c62fd7497e872fa27ee895b8e61f5746d886b"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/bin/core/src/cloud/aws.rs b/bin/core/src/cloud/aws.rs
index f6f6c9293..32e7bbac8 100644
--- a/bin/core/src/cloud/aws.rs
+++ b/bin/core/src/cloud/aws.rs
@@ -57,6 +57,7 @@ impl State {
       security_group_ids,
       key_pair_name,
       assign_public_ip,
+      use_public_ip,
     } = config.into();
     let instance_type = handle_unknown_instance_type(
       InstanceType::from(instance_type.as_str()),
@@ -122,7 +123,7 @@ impl State {
       let state_name =
         get_ec2_instance_state_name(&client, &instance_id).await?;
       if state_name == Some(InstanceStateName::Running) {
-        let ip = if assign_public_ip {
+        let ip = if use_public_ip {
           get_ec2_instance_public_ip(&client, &instance_id).await?
         } else {
           instance
diff --git a/client/rs/src/api/write/launch.rs b/client/rs/src/api/write/launch.rs
index b15eaab3e..0f22f51ec 100644
--- a/client/rs/src/api/write/launch.rs
+++ b/client/rs/src/api/write/launch.rs
@@ -36,6 +36,7 @@ pub struct LaunchAwsServerConfig {
   pub security_group_ids: Vec<String>,
   pub key_pair_name: String,
   pub assign_public_ip: bool,
+  pub use_public_ip: bool,
 }
 
 #[typeshare]
@@ -65,6 +66,7 @@ impl From<&AwsBuilderConfig> for LaunchAwsServerConfig {
       security_group_ids: value.security_group_ids.clone(),
       key_pair_name: value.key_pair_name.clone(),
       assign_public_ip: value.assign_public_ip,
+      use_public_ip: value.use_public_ip,
     }
   }
 }
diff --git a/client/rs/src/entities/builder.rs b/client/rs/src/entities/builder.rs
index 7168b54a9..812efa878 100644
--- a/client/rs/src/entities/builder.rs
+++ b/client/rs/src/entities/builder.rs
@@ -112,6 +112,9 @@ impl BuilderConfig {
             assign_public_ip: partial
               .assign_public_ip
               .unwrap_or(config.assign_public_ip),
+            use_public_ip: partial
+              .use_public_ip
+              .unwrap_or(config.use_public_ip),
             github_accounts: partial
               .github_accounts
               .unwrap_or(config.github_accounts),
@@ -162,6 +165,7 @@ pub struct AwsBuilderConfig {
   pub security_group_ids: Vec<String>,
   pub key_pair_name: String,
   pub assign_public_ip: bool,
+  pub use_public_ip: bool,
 
   #[serde(default)]
   pub github_accounts: Vec<String>,