feat(autodevops): Add NEXTAUTH_URL as default env variable

SocialGouv · Nov 30, 2021 · 3387b49 · 3387b49
1 parent 4f5443c
commit 3387b49
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 3 deletions.
diff --git a/...utodevops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/...utodevops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...evops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...evops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...todevops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/...todevops/app-ingress-anotations/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...mplates/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/...mplates/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/...tes/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...tes/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/...plates/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/...plates/autodevops/app-pgHostDev/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/app/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/...templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://preprod-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://preprod-sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/e2e/templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/azurepg/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -84,6 +84,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://sample-kosko.dev2.fabrique.social.gouv.fr
       initContainers:
         - env:
             - name: WAIT_FOR_RETRIES

diff --git a/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -85,6 +85,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://sample-kosko-e2e-branch.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://sample-kosko-e2e-branch.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service
@@ -365,6 +367,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service
@@ -671,6 +675,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service
@@ -387,6 +389,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/hasura/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service
@@ -387,6 +389,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/probes/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...plates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...plates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...templates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/...templates/autodevops/probesPath/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -82,6 +82,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/registry/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/registry/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -85,6 +85,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://sample-kosko-e2e-branch.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://sample-kosko-e2e-branch.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service
@@ -235,6 +237,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...emplates/autodevops/registry/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...emplates/autodevops/registry/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/registry/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/registry/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/resources/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/resources/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/...mplates/autodevops/resources/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/...mplates/autodevops/resources/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/resources/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/resources/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/e2e/templates/autodevops/yaml/__tests__/__snapshots__/kosko generate --env prod.ts.snap
@@ -81,6 +81,8 @@ spec:
           env:
             - name: APP_BASE_URL
               value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
+            - name: NEXTAUTH_URL
+              value: https://e2e-branch-42-sample-kosko.dev2.fabrique.social.gouv.fr
 ---
 apiVersion: v1
 kind: Service

diff --git a/templates/autodevops/components/app.ts b/templates/autodevops/components/app.ts
@@ -94,13 +94,22 @@ export default async (): Manifests => {
 
     ok(deployment);
 
+    const frontendUrl = getIngressHost(manifests);
+
     /* pass dynamic deployment URL as env var to the container */
-    const frontendUrl = new EnvVar({
+    const APP_BASE_URL = new EnvVar({
       name: "APP_BASE_URL",
-      value: `https://${getIngressHost(manifests)}`,
+      value: `https://${frontendUrl}`,
+    });
+
+    addEnv({ data: APP_BASE_URL, deployment });
+
+    const NEXTAUTH_URL = new EnvVar({
+      name: "NEXTAUTH_URL",
+      value: `https://${frontendUrl}`,
     });
 
-    addEnv({ data: frontendUrl, deployment });
+    addEnv({ data: NEXTAUTH_URL, deployment });
 
     return manifests;
   } else {