From 789cb11ed11a3f913130bf80794401bf7faed637 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 4 Jun 2020 21:30:33 -0400
Subject: [PATCH] WIP: refactor addAllRegions

---
 .../main/java/bubble/service/packer/PackerJob.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/service/packer/PackerJob.java b/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
index d9d26322..6595e651 100644
--- a/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
+++ b/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
@@ -152,12 +152,13 @@ public class PackerJob implements Callable<List<PackerImage>> {
                         }
                         ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(imagesToCreate));
                     }
+                } else {
+                    // create list of all regions, without leading/trailing double-quote, which should already be in the template
+                    addAllRegions(computeDriver, ctx);
                 }
             } else {
                 // create list of all regions, without leading/trailing double-quote, which should already be in the template
-                ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(computeDriver.getRegions().stream()
-                        .map(CloudRegion::getInternalName)
-                        .collect(Collectors.toList())));
+                addAllRegions(computeDriver, ctx);
             }
 
             final String imageName = PACKER_IMAGE_NAME_TEMPLATE
@@ -219,6 +220,12 @@ public class PackerJob implements Callable<List<PackerImage>> {
         return images;
     }
 
+    public void addAllRegions(ComputeServiceDriver computeDriver, Map<String, Object> ctx) {
+        ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(computeDriver.getRegions().stream()
+                .map(CloudRegion::getInternalName)
+                .collect(Collectors.toList())));
+    }
+
     private String toInnerStringList(List<String> list) {
         if (empty(list)) return die("toInnerStringList: empty list");
         final StringBuilder b = new StringBuilder();