fix(oauth2): allow to override config (#912)

* fix(oauth2): allow to override config * lint
SocialGouv · Feb 10, 2022 · eb67f77 · eb67f77
1 parent ee95eb9
commit eb67f77
Show file tree

Hide file tree

Showing 21 changed files with 567 additions and 461 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,3 +6,4 @@
 /utils
 coverage
 node_modules
+*.test.ts
diff --git a/e2e/kitchen-sink/__tests__/__snapshots__/multihost.ts.snap b/e2e/kitchen-sink/__tests__/__snapshots__/multihost.ts.snap
@@ -101,9 +101,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

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
@@ -241,9 +241,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch
@@ -558,9 +558,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch
@@ -863,9 +863,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch
@@ -1203,9 +1203,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

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
@@ -229,9 +229,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch
@@ -569,9 +569,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

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
@@ -229,9 +229,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch
@@ -569,9 +569,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env dev github.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env dev github.ts.snap
@@ -107,9 +107,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
@@ -101,9 +101,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env preprod github.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env preprod github.ts.snap
@@ -106,9 +106,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -100,9 +100,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env prod github.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env prod github.ts.snap
@@ -81,9 +81,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/hasura/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -77,9 +77,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env dev github.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env dev github.ts.snap
@@ -107,9 +107,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
@@ -101,9 +101,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user-e2e-branch

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env preprod github.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env preprod github.ts.snap
@@ -106,9 +106,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -100,9 +100,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env prod github.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env prod github.ts.snap
@@ -81,9 +81,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/sample/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -77,9 +77,9 @@ spec:
               path: /healthz
               port: http
             periodSeconds: 10
+            initialDelaySeconds: 30
             successThreshold: 1
             timeoutSeconds: 5
-            initialDelaySeconds: 30
           envFrom:
             - secretRef:
                 name: azure-pg-user

diff --git a/src/components/hasura/index.ts b/src/components/hasura/index.ts
@@ -19,12 +19,14 @@ const hasuraConfig: Partial<AppConfig> = {
       },
     },
     startupProbe: {
-      // wait 30 sec and up to 20*10sec to start
-      successThreshold: 1,
       failureThreshold: 20,
+
+      initialDelaySeconds: 30,
+
       periodSeconds: 10,
+      // wait 30 sec and up to 20*10sec to start
+      successThreshold: 1,
       timeoutSeconds: 5,
-      initialDelaySeconds: 30,
     },
   },
   containerPort: 80,