Merge pull request #591 from ibi-group/support-s3-link-preference

support new `prefer_s3_links` config property
ibi-group · Mar 19, 2024 · ff595d2 · ff595d2
2 parents 53dc10a + 2150660
commit ff595d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/configurations/default/server.yml.tmp b/configurations/default/server.yml.tmp
@@ -18,6 +18,8 @@ application:
 modules:
   enterprise:
     enabled: false
+    # Setting this to true will upload all feeds to S3 instead of linking to their URL
+    prefer_s3_links: false
   editor:
     enabled: true
   deployment:

diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java
@@ -17,6 +17,7 @@
 import java.text.SimpleDateFormat;
 
 import static com.conveyal.datatools.manager.DataManager.getConfigPropertyAsText;
+import static com.conveyal.datatools.manager.DataManager.hasConfigProperty;
 
 /**
  * Publish the latest GTFS files for all public feeds in a project.
@@ -67,7 +68,7 @@ public void jobLogic () {
                 .forEach(fs -> {
                     // generate list item for feed source
                     String url;
-                    if (fs.url != null) {
+                    if (fs.url != null && !hasConfigProperty("modules.enterprise.prefer_s3_links")) {
                         url = fs.url.toString();
                     }
                     else {