Merge branch 'trs/bypass-cloudfront'

nextstrain · Jun 22, 2022 · c4db81c · c4db81c
2 parents 3898a59 + 4365b26
commit c4db81c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/sources/core.js b/src/sources/core.js
@@ -12,7 +12,7 @@ const authorization = process.env.GITHUB_TOKEN
 
 class CoreSource extends Source {
   get name() { return "core"; }
-  async baseUrl() { return "http://data.nextstrain.org/"; }
+  async baseUrl() { return "https://nextstrain-data.s3.amazonaws.com/"; }
   get repo() { return "nextstrain/narratives"; }
   get branch() { return "master"; }
 
@@ -87,7 +87,7 @@ class CoreSource extends Source {
 
 class CoreStagingSource extends CoreSource {
   get name() { return "staging"; }
-  async baseUrl() { return "http://staging.nextstrain.org/"; }
+  async baseUrl() { return "https://nextstrain-staging.s3.amazonaws.com/"; }
   get repo() { return "nextstrain/narratives"; }
   get branch() { return "staging"; }
 }

diff --git a/src/sources/models.js b/src/sources/models.js
@@ -24,9 +24,7 @@ const {NoResourcePathError} = require("../exceptions");
  *
  * A concrete example:
  *
- * CoreSource (in ./core.js) represents a Cloudfront distribution
- * (https://data.nextstrain.org) in front of an S3 bucket
- * (s3://nextstrain-data).
+ * CoreSource (in ./core.js) represents an S3 bucket (s3://nextstrain-data).
  *
  *   const coreSource = new CoreSource()
  *
@@ -44,16 +42,16 @@ const {NoResourcePathError} = require("../exceptions");
  * These Subresources can be retrieved at the following URLs, which you obtain
  * using the Subresource.url() method:
  *
- *   https://data.nextstrain.org/flu_seasonal_h3n2_ha_2y.json
- *   https://data.nextstrain.org/flu_seasonal_h3n2_ha_2y_tip-frequencies.json
+ *   https://nextstrain-data.s3.amazonaws.com/flu_seasonal_h3n2_ha_2y.json
+ *   https://nextstrain-data.s3.amazonaws.com/flu_seasonal_h3n2_ha_2y_tip-frequencies.json
  *
  * Typically, the URL for a specific Subresource is composed from details in
  * the Source, Resource, and Subresource instances.  For example:
  *
- *   https://data.nextstrain.org/flu_seasonal_h3n2_ha_2y_tip-frequencies.json
- *   \_________________________/ \_____________________/ \__________________/
- *          from Source               from Dataset              from
- *                                                        DatasetSubresource
+ *   https://nextstrain-data.s3.amazonaws.com/flu_seasonal_h3n2_ha_2y_tip-frequencies.json
+ *   \______________________________________/ \_____________________/ \__________________/
+ *                from Source                      from Dataset              from
+ *                                                                     DatasetSubresource
  *
  * The actual URL construction varies between implementations but is broadly
  * similar.