endpoints: prepare for prod cutover

Author: ludovicm67

CHANGELOG.md

@@ -11,6 +11,8 @@ You can also check the
 
 ## Unreleased
 
+- Maintenance
+  - Update available data sources after LINDAS PROD cut over
 - Fixes
   - Fix XSS vulnerability caused by unescaped map layer attributions
   - Allow GraphQL endpoint to return larger responses by increasing the response

app/.env.development

@@ -1,8 +1,8 @@
 DATABASE_URL=postgres://postgres:password@localhost:5432/visualization_tool
-ENDPOINT=sparql+https://lindas-cached.cluster.ldbar.ch/query
+ENDPOINT=sparql+https://cached.lindas.admin.ch/query
 SPARQL_GEO_ENDPOINT=https://geo.ld.admin.ch/query
 GRAPHQL_ENDPOINT=/api/graphql
-WHITELISTED_DATA_SOURCES=["Prod", "Prod-uncached", "Int", "Int-uncached", "Test", "Test-uncached", "LINDASnext-Prod", "LINDASnext-Prod-uncached", "LINDASnext-Int", "LINDASnext-Int-uncached", "LINDASold-Test", "LINDASold-Test-uncached"]
+WHITELISTED_DATA_SOURCES=["Prod", "Prod-uncached", "Int", "Int-uncached", "Test", "Test-uncached", "LINDASold-Prod", "LINDASold-Prod-uncached", "LINDASold-Int", "LINDASold-Int-uncached", "LINDASold-Test", "LINDASold-Test-uncached"]
 NEXT_PUBLIC_VECTOR_TILE_URL=https://world.vectortiles.geo.admin.ch
 NEXT_PUBLIC_MAPTILER_STYLE_KEY=123
 ADFS_PROFILE_URL=https://www.myaccount-r.eiam.admin.ch/

app/components/graphql-termsets.stories.tsx

@@ -19,7 +19,7 @@ export const Termsets = () => {
     variables: {
       locale: "en",
       sourceType: "sparql",
-      sourceUrl: "https://lindas-cached.cluster.ldbar.ch/query",
+      sourceUrl: "https://cached.lindas.admin.ch/query",
       cubeFilter: {
         iri: cube,
       },

app/docs/catalog/chart-preview-via-api.mdx

@@ -165,7 +165,7 @@ An example configurator state is shown below.
     "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/7",
   dataSource: {
     type: "sparql",
-    url: "https://lindas-cached.cluster.ldbar.ch/query",
+    url: "https://cached.lindas.admin.ch/query",
   },
   meta: {
     title: {

app/domain/data-source/constants.ts

@@ -2,10 +2,9 @@ import keyBy from "lodash/keyBy";
 
 import { WHITELISTED_DATA_SOURCES } from "../env";
 
-export const LEGACY_PROD_DATA_SOURCE_URL = "https://lindas.admin.ch/query";
+export const UNCACHED_PROD_DATA_SOURCE_URL = "https://lindas.admin.ch/query";
 
-export const PROD_DATA_SOURCE_URL =
-  "https://lindas-cached.cluster.ldbar.ch/query";
+export const PROD_DATA_SOURCE_URL = "https://cached.lindas.admin.ch/query";
 
 interface SourceOption {
   value: string;
@@ -26,32 +25,13 @@ export const SOURCE_OPTIONS: SourceOption[] = [
     supportsCachingPerCubeIri: true,
   },
   {
-    value: "sparql+https://lindas.admin.ch/query",
+    value: `sparql+${UNCACHED_PROD_DATA_SOURCE_URL}`,
     key: "Prod-uncached",
     label: "LINDAS PROD (uncached)",
-    url: "https://lindas.admin.ch/query",
+    url: UNCACHED_PROD_DATA_SOURCE_URL,
     isTrusted: true,
     supportsCachingPerCubeIri: true,
   },
-
-  // For LINDASnext
-  {
-    value: "sparql+https://cached.lindas.admin.ch/query",
-    key: "LINDASnext-Prod",
-    label: "LINDASnext PROD",
-    url: "https://cached.lindas.admin.ch/query",
-    isTrusted: true,
-    supportsCachingPerCubeIri: true,
-  },
-  {
-    value: "sparql+https://lindas.cz-aws.net/query",
-    key: "LINDASnext-Prod-uncached",
-    label: "LINDASnext PROD (uncached)",
-    url: "https://lindas.cz-aws.net/query",
-    isTrusted: false,
-    supportsCachingPerCubeIri: true,
-  },
-  // Migration done for the following data sources
   {
     value: "sparql+https://int.cached.lindas.admin.ch/query",
     key: "Int",
@@ -86,6 +66,22 @@ export const SOURCE_OPTIONS: SourceOption[] = [
   },
 
   // For LINDASold
+  {
+    value: "sparql+https://lindas-cached.cluster.ldbar.ch/query",
+    key: "LINDASold-Prod",
+    label: "LINDASold PROD",
+    url: "https://lindas-cached.cluster.ldbar.ch/query",
+    isTrusted: false,
+    supportsCachingPerCubeIri: true,
+  },
+  {
+    value: "sparql+https://old.ld.ldbar.ch/query",
+    key: "LINDASold-Prod-uncached",
+    label: "LINDASold PROD (uncached)",
+    url: "https://old.ld.ldbar.ch/query",
+    isTrusted: false,
+    supportsCachingPerCubeIri: true,
+  },
   {
     value: "sparql+https://lindas-cached.int.cluster.ldbar.ch/query",
     key: "LINDASold-Int",

app/domain/data-source/index.spec.ts

@@ -33,7 +33,7 @@ const createRouter = ({ query }: { query: Record<string, string> }) => {
 
 vi.mock("../env", () => ({
   WHITELISTED_DATA_SOURCES: ["Test", "Prod", "Int"],
-  ENDPOINT: "sparql+https://lindas-cached.cluster.ldbar.ch/query", // Default is Prod in tests
+  ENDPOINT: "sparql+https://cached.lindas.admin.ch/query", // Default is Prod in tests
 }));
 
 describe("datasource state hook", () => {
@@ -88,7 +88,7 @@ describe("datasource state hook", () => {
 
     expect(getState()).toEqual({
       type: "sparql",
-      url: "https://lindas-cached.cluster.ldbar.ch/query",
+      url: "https://cached.lindas.admin.ch/query",
     });
   });
 
@@ -125,7 +125,7 @@ describe("datasource state hook", () => {
     act(() => {
       setState({
         type: "sparql",
-        url: "https://lindas-cached.cluster.ldbar.ch/query",
+        url: "https://cached.lindas.admin.ch/query",
       });
     });
 

app/domain/env.ts

@@ -24,7 +24,7 @@ export const PUBLIC_URL = (
 export const ENDPOINT =
   clientEnv?.ENDPOINT ??
   process.env.ENDPOINT ??
-  "sparql+https://lindas-cached.cluster.ldbar.ch/query";
+  "sparql+https://cached.lindas.admin.ch/query";
 
 export const WHITELISTED_DATA_SOURCES = clientEnv?.WHITELISTED_DATA_SOURCES ??
   (process.env.WHITELISTED_DATA_SOURCES !== undefined

app/pages/_preview.tsx

@@ -55,7 +55,7 @@ const CONFIGURATOR_STATE_COLUMN = {
     "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/2",
   dataSource: {
     type: "sparql",
-    url: "https://lindas-cached.cluster.ldbar.ch/query",
+    url: "https://cached.lindas.admin.ch/query",
   },
   meta: {
     title: { de: "", fr: "", it: "", en: "" },

app/pages/_preview_post.tsx

@@ -39,7 +39,7 @@ const photovoltaikanlagenState = {
     "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/7",
   dataSource: {
     type: "sparql",
-    url: "https://lindas-cached.cluster.ldbar.ch/query",
+    url: "https://cached.lindas.admin.ch/query",
   },
   meta: {
     title: {
@@ -111,7 +111,7 @@ const nfiState = {
   dataSet: "https://environment.ld.admin.ch/foen/nfi/nfi_C-1266/cube/2023-1",
   dataSource: {
     type: "sparql",
-    url: "https://lindas-cached.cluster.ldbar.ch/query",
+    url: "https://cached.lindas.admin.ch/query",
   },
   meta: {
     title: {

app/test/__fixtures/config/prod/column-1.json

@@ -2,13 +2,23 @@
   "key": "g_Dcz7A82MNj",
   "data": {
     "meta": {
-      "title": { "de": "", "en": "", "fr": "", "it": "" },
-      "description": { "de": "", "en": "", "fr": "", "it": "" }
+      "title": {
+        "de": "",
+        "en": "",
+        "fr": "",
+        "it": ""
+      },
+      "description": {
+        "de": "",
+        "en": "",
+        "fr": "",
+        "it": ""
+      }
     },
     "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_105/dataset",
     "dataSource": {
       "type": "sparql",
-      "url": "https://lindas-cached.cluster.ldbar.ch/query"
+      "url": "https://cached.lindas.admin.ch/query"
     },
     "chartConfig": {
       "version": "1.2.1",