Refactor decorator env

navikt · Nov 15, 2023 · 5d11f3f · 5d11f3f
1 parent fe3bc3e
commit 5d11f3f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/nais/nais-demo.yaml b/nais/nais-demo.yaml
@@ -43,8 +43,6 @@ spec:
   ingresses:
     - {{ingress}}
   env:
-    - name: DECORATOR_ENV
-      value: "prod"
     - name: AKTIVITETSKRAV_BACKEND_HOST
       value: "http://aktivitetskrav-backend.team-esyfo"
     - name: MIN_SIDE_ROOT

diff --git a/nais/nais-dev.yaml b/nais/nais-dev.yaml
@@ -44,8 +44,6 @@ spec:
   env:
     - name: DECORATOR_URL
       value: "https://dekoratoren.dev.nav.no"
-    - name: DECORATOR_ENV
-      value: "dev"
     - name: AKTIVITETSKRAV_BACKEND_HOST
       value: "http://aktivitetskrav-backend.team-esyfo"
     - name: AKTIVITETSKRAV_BACKEND_CLIENT_ID

diff --git a/nais/nais-prod.yaml b/nais/nais-prod.yaml
@@ -44,8 +44,6 @@ spec:
   env:
     - name: DECORATOR_URL
       value: "https://nav.no/dekoratoren"
-    - name: DECORATOR_ENV
-      value: "prod"
     - name: AKTIVITETSKRAV_BACKEND_HOST
       value: "http://aktivitetskrav-backend.team-esyfo"
     - name: AKTIVITETSKRAV_BACKEND_CLIENT_ID

diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -11,7 +11,6 @@ import Document, {
   NextScript,
 } from "next/document";
 import { AktivitetspliktCrumbs } from "@/breadcrumbs/breadcrumbs";
-import serverEnv from "@/env/serverEnv";
 
 // The 'head'-field of the document initialProps contains data from <head> (meta-tags etc)
 const getDocumentParameter = (
@@ -32,7 +31,8 @@ export default class MyDocument extends Document<Props> {
     const initialProps = await Document.getInitialProps(ctx);
 
     const Decorator = await fetchDecoratorReact({
-      env: serverEnv.DECORATOR_ENV,
+      env:
+        process.env.NEXT_PUBLIC_RUNTIME_ENVIRONMENT === "prod" ? "prod" : "dev",
       params: {
         context: "privatperson",
         chatbot: true,