WIP. working on vultr packer builds

bubble-server/src/main/java/bubble/cloud/NoopCloud.java

@@ -70,7 +70,6 @@ public class NoopCloud implements
     }
 
     @Override public List<PackerImage> getPackerImages() { return Collections.emptyList(); }
-    @Override public List<PackerImage> writePackerImages() { return Collections.emptyList(); }
 
     @Override public boolean _write(String fromNode, String key, InputStream data, StorageMetadata metadata, String requestId) throws IOException {
         if (log.isDebugEnabled()) log.debug("_write(fromNode=" + fromNode + ")");

bubble-server/src/main/java/bubble/cloud/compute/ComputeServiceDriver.java

@@ -34,6 +34,5 @@ public interface ComputeServiceDriver extends CloudServiceDriver, RegionalServic
     @Override default boolean test () { return true; }
 
     List<PackerImage> getPackerImages();
-    List<PackerImage> writePackerImages();
 
 }

bubble-server/src/main/java/bubble/cloud/compute/ComputeServiceDriverBase.java

@@ -73,11 +73,14 @@ public abstract class ComputeServiceDriverBase
     private List<CloudRegion> initRegions() {
         final ArrayList<CloudRegion> cloudRegions = new ArrayList<>();
         for (CloudRegion configRegion : config.getRegions()) {
-            final CloudRegion region = getCloudRegions().stream().filter(s -> s.getInternalName().equals(configRegion.getInternalName())).findFirst().orElse(null);
-            if (region == null) {
+            final CloudRegion cloudRegion = getCloudRegions().stream()
+                    .filter(s -> s.getInternalName().equalsIgnoreCase(configRegion.getInternalName()))
+                    .findFirst()
+                    .orElse(null);
+            if (cloudRegion == null) {
                 log.warn("initRegions: config region not found: "+configRegion.getInternalName());
             } else {
-                cloudRegions.add(configRegion);
+                cloudRegions.add(configRegion.setId(cloudRegion.getId()));
             }
         }
         return cloudRegions;

bubble-server/src/main/java/bubble/cloud/compute/delegate/DelegatedComputeDriver.java

@@ -76,6 +76,5 @@ public class DelegatedComputeDriver extends DelegatedCloudServiceDriverBase impl
     }
 
     @Override public List<PackerImage> getPackerImages() { return notSupported("getPackerImages"); }
-    @Override public List<PackerImage> writePackerImages() { return notSupported("writePackerImages"); }
 
 }

bubble-server/src/main/java/bubble/cloud/compute/digitalocean/DigitalOceanDriver.java

@@ -262,8 +262,4 @@ public class DigitalOceanDriver extends ComputeServiceDriverBase {
         return images == null ? Collections.emptyList() : images;
     }
 
-    @Override public List<PackerImage> writePackerImages() {
-        return null;
-    }
-
 }

bubble-server/src/main/java/bubble/cloud/compute/digitalocean/DigitalOceanPackerImageParser.java

@@ -14,9 +14,7 @@ public class DigitalOceanPackerImageParser extends ListResourceParser<PackerImag
 
     private String jarSha;
 
-    public DigitalOceanPackerImageParser (String jarSha) {
-        this.jarSha = jarSha;
-    }
+    public DigitalOceanPackerImageParser (String jarSha) { this.jarSha = jarSha; }
 
     @Override public boolean allowEmpty() { return true; }
 

bubble-server/src/main/java/bubble/cloud/compute/ec2/AmazonEC2Driver.java

@@ -329,6 +329,5 @@ public class AmazonEC2Driver extends ComputeServiceDriverBase {
 
     // todo
     @Override public List<PackerImage> getPackerImages() { return notSupported("getPackerImages"); }
-    @Override public List<PackerImage> writePackerImages() { return notSupported("writePackerImages"); }
 
 }

bubble-server/src/main/java/bubble/cloud/compute/local/LocalComputeDriver.java

@@ -28,6 +28,5 @@ public class LocalComputeDriver extends CloudServiceDriverBase<ComputeConfig> im
     @Override public BubbleNode status(BubbleNode node) throws Exception { return notSupported("status"); }
 
     @Override public List<PackerImage> getPackerImages() { return notSupported("getPackerImages"); }
-    @Override public List<PackerImage> writePackerImages() { return notSupported("writePackerImages"); }
 
 }

bubble-server/src/main/java/bubble/cloud/compute/mock/MockComputeDriver.java

@@ -69,6 +69,5 @@ public class MockComputeDriver extends ComputeServiceDriverBase {
     }
 
     @Override public List<PackerImage> getPackerImages() { return Collections.emptyList(); }
-    @Override public List<PackerImage> writePackerImages() { return Collections.emptyList(); }
 
 }

bubble-server/src/main/java/bubble/cloud/compute/vultr/VultrDriver.java

@@ -17,7 +17,10 @@ import org.cobbzilla.util.http.HttpResponseBean;
 
 import javax.persistence.EntityNotFoundException;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 import static bubble.model.cloud.BubbleNode.TAG_INSTANCE_ID;
 import static bubble.model.cloud.BubbleNode.TAG_SSH_KEY_ID;
@@ -45,6 +48,7 @@ public class VultrDriver extends ComputeServiceDriverBase {
     public static final String REGIONS_URL = VULTR_API_BASE + "regions/list";
     public static final String PLANS_URL = VULTR_API_BASE + "plans/list";
     public static final String OS_URL = VULTR_API_BASE + "os/list";
+    public static final String SNAPSHOT_URL = VULTR_API_BASE + "snapshot/list";
 
     public static final String VULTR_SUBID = "SUBID";
     public static final String VULTR_V4_IP = "main_ip";
@@ -66,9 +70,10 @@ public class VultrDriver extends ComputeServiceDriverBase {
     public static final long SERVER_STOP_TIMEOUT = SECONDS.toMillis(60);
     public static final long SERVER_STOP_CHECK_INTERVAL = SECONDS.toMillis(5);
 
-    private static <T> List<T> loadCloudResources(String uri, ResourceParser<T, List<T>> parser) {
+    private <T> List<T> loadCloudResources(String uri, ResourceParser<T, List<T>> parser) {
         try {
-            final HttpResponseBean response = getResponse(uri);
+            final HttpRequestBean request = auth(new HttpRequestBean(uri));
+            final HttpResponseBean response = getResponse(request);
             final JsonNode node = json(response.getEntityString(), JsonNode.class);
             final List<T> resources = parser.newResults();
             for (Iterator<String> fields = node.fieldNames(); fields.hasNext(); ) {
@@ -368,8 +373,9 @@ public class VultrDriver extends ComputeServiceDriverBase {
         }
     }
 
-    // todo
-    @Override public List<PackerImage> getPackerImages() { return notSupported("getPackerImages"); }
-    @Override public List<PackerImage> writePackerImages() { return notSupported("writePackerImages"); }
+    @Override public List<PackerImage> getPackerImages() {
+        final List<PackerImage> images = loadCloudResources(SNAPSHOT_URL, new VultrPackerImageParser(configuration.getJarSha()));
+        return images == null ? Collections.emptyList() : images;
+    }
 
 }

bubble-server/src/main/java/bubble/cloud/compute/vultr/VultrPackerImageParser.java

@@ -0,0 +1,27 @@
+package bubble.cloud.compute.vultr;
+
+import bubble.cloud.compute.ListResourceParser;
+import bubble.cloud.compute.PackerImage;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import static bubble.service.packer.PackerJob.PACKER_IMAGE_PREFIX;
+import static org.cobbzilla.util.daemon.ZillaRuntime.die;
+
+public class VultrPackerImageParser extends ListResourceParser<PackerImage> {
+
+    private String jarSha;
+
+    public VultrPackerImageParser(String jarSha) { this.jarSha = jarSha; }
+
+    @Override public PackerImage parse(JsonNode item) {
+        if (!item.has("SNAPSHOTID")) return die("parse: SNAPSHOTID not found");
+        if (!item.has("OSID")) return die("parse: OSID not found");
+        if (!item.has("description")) return die("parse: description not found");
+        final String name = item.get("description").textValue();
+        if (!name.startsWith(PACKER_IMAGE_PREFIX)) return null;
+        if (!name.endsWith("_"+jarSha)) return null;
+        return new PackerImage()
+                .setName(name)
+                .setId(item.get("SNAPSHOTID").textValue());
+    }
+}

bubble-server/src/main/java/bubble/service/packer/PackerBuild.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Arrays;
+
 public class PackerBuild {
 
     @Getter @Setter private String name;
@@ -19,11 +21,11 @@ public class PackerBuild {
 
     public PackerImage toPackerImage(String name) {
         final String[] parts = artifact_id.split(":");
-        final String regionName = parts[0];
+        final CloudRegion[] regions = (CloudRegion[]) Arrays.stream(parts[0].split(",")).map(r -> new CloudRegion().setInternalName(r)).toArray();
         final String id = parts[1];
         return new PackerImage()
                 .setId(id)
                 .setName(name)
-                .setRegions(new CloudRegion[]{new CloudRegion().setInternalName(regionName)});
+                .setRegions(regions);
     }
 }

bubble-server/src/main/java/bubble/service/packer/PackerJob.java

@@ -155,7 +155,7 @@ public class PackerJob implements Callable<List<PackerImage>> {
             // run packer, return handle to running packer
             log.info("running packer for "+installType+"...");
             final CommandResult commandResult = CommandShell.exec(new Command(new CommandLine("packer")
-                    .addArgument("build").addArgument("packer.json"))
+                    .addArgument("build").addArgument("-parallel-builds=2").addArgument("packer.json"))
                     .setDir(tempDir)
                     .setEnv(env)
                     .setCopyToStandard(true));

bubble-server/src/main/resources/models/defaults/cloudService.json

@@ -185,6 +185,10 @@
         "name": "Vultr - Tokyo",
         "internalName": "Tokyo",
         "location": {"city": "Tokyo", "country": "JP", "region": "Kantō", "lat": "35.689722", "lon": "139.692222"}
+      }, {
+        "name": "Vultr - Seoul",
+        "internalName": "Seoul",
+        "location": {"city": "Seoul", "country": "KR", "region": "Sudogwon", "lat": "37.566667", "lon": "126.966667"}
       }, {
         "name": "Vultr - Sydney",
         "internalName": "Sydney",
@@ -202,13 +206,12 @@
       "os": "Ubuntu 18.04 x64",
       "packer": {
         "vars": [{"name": "VULTR_API_KEY", "value": "[[credentials.apiKey]]"}],
-        "iterateRegions": true,
         "builder": {
           "type": "vultr",
           "ssh_username": "root",
           "api_key": "[[user `VULTR_API_KEY`]]",
           "os_id": "<<os.id>>",
-          "region_id": "<<region.id>>",
+          "region_id": "<<buildRegion.id>>",
           "plan_id": "<<sizes.small.id>>",
           "instance_label": "<<packerImageName>>",
           "snapshot_description": "<<packerImageName>>",