fix(ingester): use process.env.HASURA_GRAPHQL_ENDPOINT (#185)

* fix(ingester): use process.env.HASURA_GRAPHQL_ENDPOINT * Update package.json * Update .env * Update www-env.configmap.yaml * Update www-env.configmap.yaml * Update graphql.js * Update alert.cronjob.yaml * Update ingester.cronjob.yaml * Update package.json
SocialGouv · Nov 19, 2020 · 17ba8ea · 17ba8ea
1 parent 740c816
commit 17ba8ea
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/shared/graphql-client/src/index.js b/shared/graphql-client/src/index.js
@@ -2,7 +2,7 @@ import fetch from "isomorphic-unfetch";
 import { createClient } from "@urql/core";
 
 const HASURA_GRAPHQL_ADMIN_SECRET = process.env.HASURA_GRAPHQL_ADMIN_SECRET;
-const HASURA_GRAPHQL_ENDPOINT = process.env.GRAPHQL_ENDPOINT;
+const HASURA_GRAPHQL_ENDPOINT = process.env.HASURA_GRAPHQL_ENDPOINT;
 
 export const client = createClient({
   url: HASURA_GRAPHQL_ENDPOINT,

diff --git a/targets/alert-cli/.k8s/alert.cronjob.yaml b/targets/alert-cli/.k8s/alert.cronjob.yaml
@@ -30,7 +30,7 @@ spec:
               env:
                 - name: PRODUCTION
                   value: "${PRODUCTION}"
-                - name: GRAPHQL_ENDPOINT
+                - name: HASURA_GRAPHQL_ENDPOINT
                   value: "http://hasura-cdtn-admin/v1/graphql"
               envFrom:
                 - secretRef:

diff --git a/targets/alert-cli/package.json b/targets/alert-cli/package.json
@@ -40,8 +40,8 @@
     "build": "ncc build ./src/index.js -o ./dist -e nodegit -s",
     "poststart": "sh scripts/clean.sh",
     "start": "node --enable-source-maps --unhandled-rejections=strict ./dist/index.js",
-    "start:dev": "GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 node -r esm src/index.js",
-    "start:dump": "GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 DUMP=true node -r esm src/index.js > data/dump.json",
+    "start:dev": "HASURA_GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 node -r esm src/index.js",
+    "start:dump": "HASURA_GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 DUMP=true node -r esm src/index.js > data/dump.json",
     "lint": "eslint src/**/*.js",
     "types": "tsc",
     "test": "jest"

diff --git a/targets/frontend/.env b/targets/frontend/.env
@@ -15,5 +15,5 @@ REFRESH_TOKEN_EXPIRES=43200
 NEXT_PUBLIC_ACTIVATION_TOKEN_EXPIRES=10080
 
 FRONTEND_URL=http://localhost:3000
-GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql
+HASURA_GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql
 PORT=3000
diff --git a/targets/frontend/.k8s/environments/dev/www-env.configmap.yaml b/targets/frontend/.k8s/environments/dev/www-env.configmap.yaml
@@ -7,7 +7,7 @@ data:
   FRONTEND_URL: "https://${HOST}"
   FRONTEND_PORT: "${PORT}"
   CI_COMMIT_SHORT_SHA: "${CI_COMMIT_SHORT_SHA}"
-  GRAPHQL_ENDPOINT: "http://hasura-cdtn-admin/v1/graphql"
+  HASURA_GRAPHQL_ENDPOINT: "http://hasura-cdtn-admin/v1/graphql"
   NEXT_PUBLIC_ACTIVATION_TOKEN_EXPIRES: "10080"
   NODE_ENV: "production"
   REFRESH_TOKEN_EXPIRES: "43200"
diff --git a/targets/frontend/.k8s/environments/prod/www-env.configmap.yaml b/targets/frontend/.k8s/environments/prod/www-env.configmap.yaml
@@ -7,7 +7,7 @@ data:
   FRONTEND_URL: "https://${HOST}"
   FRONTEND_PORT: "${PORT}"
   CI_COMMIT_SHORT_SHA: "${CI_COMMIT_SHORT_SHA}"
-  GRAPHQL_ENDPOINT: "http://hasura-cdtn-admin/v1/graphql"
+  HASURA_GRAPHQL_ENDPOINT: "http://hasura-cdtn-admin/v1/graphql"
   NEXT_PUBLIC_ACTIVATION_TOKEN_EXPIRES: "10080"
   NODE_ENV: "production"
   PRODUCTION: "true"

diff --git a/targets/frontend/src/pages/api/graphql.js b/targets/frontend/src/pages/api/graphql.js
@@ -20,7 +20,7 @@ const proxy = createProxyMiddleware({
   },
   pathRewrite: { "^/api/graphql": "/v1/graphql" },
   prependPath: false,
-  target: process.env.GRAPHQL_ENDPOINT,
+  target: process.env.HASURA_GRAPHQL_ENDPOINT,
   ws: true,
   xfwd: true, // proxy websockets
 });

diff --git a/targets/ingester/.k8s/ingester.cronjob.yaml b/targets/ingester/.k8s/ingester.cronjob.yaml
@@ -30,7 +30,7 @@ spec:
               env:
                 - name: PRODUCTION
                   value: "${PRODUCTION}"
-                - name: GRAPHQL_ENDPOINT
+                - name: HASURA_GRAPHQL_ENDPOINT
                   value: "http://hasura-cdtn-admin/v1/graphql"
               envFrom:
                 - secretRef:

diff --git a/targets/ingester/package.json b/targets/ingester/package.json
@@ -50,7 +50,7 @@
   "scripts": {
     "build": "ncc build ./src/cli.js -o ./dist -s",
     "cli": "node --enable-source-maps --unhandled-rejections=strict dist/index.js",
-    "cli:dev": "GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 node -r esm src/cli.js",
+    "cli:dev": "HASURA_GRAPHQL_ENDPOINT=http://localhost:8080/v1/graphql HASURA_GRAPHQL_ADMIN_SECRET=admin1 node -r esm src/cli.js",
     "lint": "eslint src/**/*.js",
     "types": "tsc",
     "test": "jest --passWithNoTests"