feat: use all zone names when naming resources

mentimeter · Feb 18, 2025 · e71238d · e71238d
1 parent 02ea9fe
commit e71238d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/linkup-cli/src/commands/deploy/cf_deploy.rs b/linkup-cli/src/commands/deploy/cf_deploy.rs
@@ -53,17 +53,21 @@ pub async fn deploy(args: &DeployArgs) -> Result<(), DeployError> {
 
     let cloudflare_api = AccountCloudflareApi::new(
         args.account_id.to_string(),
-        zone_ids_strings,
+        zone_ids_strings.clone(),
         Box::new(auth),
     );
     let notifier = ConsoleNotifier::new();
 
-    let tunnel_zone_name = cloudflare_api.get_zone_name(&args.zone_ids[0]).await?;
+    let mut zone_names = Vec::with_capacity(zone_ids_strings.len());
+    for zone_id in zone_ids_strings {
+        let zone_name = cloudflare_api.get_zone_name(&zone_id).await?;
+        zone_names.push(zone_name);
+    }
 
     let resources = cf_resources(
         args.account_id.clone(),
         args.zone_ids[0].clone(),
-        &tunnel_zone_name,
+        &zone_names,
         &args.zone_ids,
     );
 

diff --git a/linkup-cli/src/commands/deploy/cf_destroy.rs b/linkup-cli/src/commands/deploy/cf_destroy.rs
@@ -37,17 +37,21 @@ pub async fn destroy(args: &DestroyArgs) -> Result<(), DeployError> {
 
     let cloudflare_api = AccountCloudflareApi::new(
         args.account_id.to_string(),
-        zone_ids_strings,
+        zone_ids_strings.clone(),
         Box::new(auth),
     );
     let notifier = ConsoleNotifier::new();
 
-    let tunnel_zone_name = cloudflare_api.get_zone_name(&args.zone_ids[0]).await?;
+    let mut zone_names = Vec::with_capacity(zone_ids_strings.len());
+    for zone_id in zone_ids_strings {
+        let zone_name = cloudflare_api.get_zone_name(&zone_id).await?;
+        zone_names.push(zone_name);
+    }
 
     let resources = cf_resources(
         args.account_id.clone(),
         args.zone_ids[0].clone(),
-        &tunnel_zone_name,
+        &zone_names,
         &args.zone_ids,
     );
 

diff --git a/linkup-cli/src/commands/deploy/resources.rs b/linkup-cli/src/commands/deploy/resources.rs
@@ -837,10 +837,11 @@ pub fn rules_equal(current: &[Rule], desired: &[Rule]) -> bool {
 pub fn cf_resources(
     account_id: String,
     tunnel_zone_id: String,
-    tunnel_zone_name: &str,
+    all_zone_names: &[String],
     all_zone_ids: &[String],
 ) -> TargetCfResources {
-    let linkup_script_name = format!("linkup-worker-{tunnel_zone_name}");
+    let joined_zone_names = all_zone_names.join("-");
+    let linkup_script_name = format!("linkup-worker-{joined_zone_names}");
 
     TargetCfResources {
         worker_script_name: linkup_script_name.clone(),
@@ -873,15 +874,15 @@ pub fn cf_resources(
         ],
         kv_namespaces: vec![
             KvNamespace {
-                name: format!("linkup-session-kv-{tunnel_zone_name}"),
+                name: format!("linkup-session-kv-{joined_zone_names}"),
                 binding: "LINKUP_SESSIONS".to_string(),
             },
             KvNamespace {
-                name: format!("linkup-tunnels-kv-{tunnel_zone_name}"),
+                name: format!("linkup-tunnels-kv-{joined_zone_names}"),
                 binding: "LINKUP_TUNNELS".to_string(),
             },
             KvNamespace {
-                name: format!("linkup-certificate-cache-kv-{tunnel_zone_name}"),
+                name: format!("linkup-certificate-cache-kv-{joined_zone_names}"),
                 binding: "LINKUP_CERTIFICATE_CACHE".to_string(),
             },
         ],