Skip to content

Rename "wnv/global" to "wnv/all-lineages" #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j23414 merged 1 commit into from
Mar 17, 2025
Merged

Rename "wnv/global" to "wnv/all-lineages" #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/manifest_core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,12 +778,12 @@
},
"WNV": {
"resolution": {
"global": "",
"all-lineages": "",
"wa": "",
"lineage-1A": "",
"lineage-2": "",
"NA": "",
"default": "global"
"default": "all-lineages"
}
},
"yellow-fever": {
Expand Down
14 changes: 7 additions & 7 deletions test/date_descriptor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
*
*
* Testing of requests made using URLs with date descriptors (i.e. @YYYY-MM-DD).
* It would be better if we also ran the server from the test process and could
* spy on the requests being made to check the correct versionId is being used
* in the requests to AWS.
*
*
*/

/**
Expand Down Expand Up @@ -114,7 +114,7 @@ const narratives = [
describe("Request valid main datasets", () => {

for (const d of datasets.filter((el) => !el.hasOwnProperty('sidecar') && el.valid===true)) {

if (d.charon!==false) {
it(`Charon API using ${d.prefix}`, async () => {
const url = `${BASE_URL}/charon/getDataset?prefix=${d.prefix}`;
Expand Down Expand Up @@ -302,14 +302,14 @@ describe("Valid narratives", () => {
})

const redirects = [
["WNV", "WNV/global"],
["WNV", "WNV/all-lineages"],
/* Note that WNV is not in the index, so this versioned test ensures we are
not checking the existence/validity of any version descriptor against the WNV
resource, rather we are redirecting and deferring those checks */
["WNV@2025-03-12", "WNV/global@2025-03-12"],
["WNV@2025-03-17", "WNV/all-lineages@2025-03-17"],
/* URL queries should be preserved across the redirect, but only for the RESTful API */
["WNV@2025-03-12?c=region", "WNV/global@2025-03-12?c=region", {charon: false}],
["staging/WNV@2025-03-13?c=region", "staging/WNV/global@2025-03-13?c=region", {charon: false}],
["WNV@2025-03-17?c=region", "WNV/all-lineages@2025-03-17?c=region", {charon: false}],
["staging/WNV@2025-03-17?c=region", "staging/WNV/all-lineages@2025-03-17?c=region", {charon: false}],
]

describe("Paths redirect with version descriptors", () => {
Expand Down
2 changes: 1 addition & 1 deletion test/inventory_parsing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('back-to-back delete markers', async () => {
test('core URL redirects (via our manifest) are correctly obtained', async () => {
const expected_url_redirects = {
'dengue/denv1': 'dengue/denv1/genome',
WNV: 'WNV/global',
WNV: 'WNV/all-lineages',
'seasonal-flu': 'seasonal-flu/h3n2/ha/2y',
'seasonal-flu/h3n2': 'seasonal-flu/h3n2/ha/2y',
'seasonal-flu/h3n2/ha': 'seasonal-flu/h3n2/ha/2y',
Expand Down