Deploy OTP to AWS load balancer and manage OTP servers in separate collection (and misc other fixes)

configurations/default/server.yml.tmp

@@ -13,6 +13,15 @@ modules:
     enabled: false
   editor:
     enabled: false
+  deployment:
+    enabled: false
+    ec2:
+      enabled: false
+      subnet: subnet-id
+      securityGroup: security-group-id
+      ami: ami-id
+      arn: arn
+      keyName: some-pem-file-without-suffix
   user_admin:
     enabled: true
   # Enable GTFS+ module for testing purposes

pom.xml

@@ -388,6 +388,17 @@
             <artifactId>super-csv</artifactId>
             <version>2.4.0</version>
         </dependency>
+        <!-- AWS individual module imports (S3 imported by gtfs-lib) -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-ec2</artifactId>
+            <version>1.11.410</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
+            <version>1.11.410</version>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/com/conveyal/datatools/common/status/MonitorableJob.java

@@ -60,6 +60,7 @@ public enum JobType {
         EXPORT_SNAPSHOT_TO_GTFS,
         CONVERT_EDITOR_MAPDB_TO_SQL,
         VALIDATE_ALL_FEEDS,
+        MONITOR_SERVER_STATUS,
         MERGE_FEED_VERSIONS
     }
 

src/main/java/com/conveyal/datatools/editor/controllers/api/SnapshotController.java

@@ -219,7 +219,7 @@ private static Snapshot deleteSnapshot(Request req, Response res) {
         if (snapshot == null) logMessageAndHalt(req, 400, "Must provide valid snapshot ID.");
         try {
             // Remove the snapshot and then renumber the snapshots
-            Persistence.snapshots.removeById(snapshot.id);
+            snapshot.delete();
             feedSource.renumberSnapshots();
             // FIXME Are there references that need to be removed? E.g., what if the active buffer snapshot is deleted?
             // FIXME delete tables from database?

src/main/java/com/conveyal/datatools/editor/datastore/FeedTx.java

@@ -32,8 +32,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
-import static com.conveyal.datatools.editor.jobs.ProcessGtfsSnapshotExport.toGtfsDate;
-
 /** a transaction in an agency database */
 public class FeedTx extends DatabaseTx {
     private static final Logger LOG = LoggerFactory.getLogger(FeedTx.class);
@@ -124,6 +122,10 @@ public FeedTx(DB tx, boolean buildSecondaryIndices) {
 //        editedSinceSnapshot = tx.getAtomicBoolean("editedSinceSnapshot") == null ? tx.createAtomicBoolean("editedSinceSnapshot", false) : editedSinceSnapshot;
     }
 
+    private static int toGtfsDate (LocalDate date) {
+        return date.getYear() * 10000 + date.getMonthValue() * 100 + date.getDayOfMonth();
+    }
+
     public void commit () {
         try {
 //            editedSinceSnapshot.set(true);