fix(hasura): use azure fix pg user on tags

SocialGouv · Jul 30, 2020 · fda47d0 · fda47d0
1 parent 8108e13
commit fda47d0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -90,7 +90,7 @@ spec:
             periodSeconds: 5
           envFrom:
             - secretRef:
-                name: azure-pg-user-undefined
+                name: azure-pg-user
       initContainers:
         - name: wait-for-postgres
           image: 'postgres:10'

diff --git a/src/utils/addPostgresUserSecret.ts b/src/utils/addPostgresUserSecret.ts
@@ -1,21 +1,22 @@
 import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom";
+import { Deployment } from "kubernetes-models/apps/v1/Deployment";
 import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource";
 
-// DEV: add secret to access DB
-//@ts-expect-error
-export const addPostgresUserSecret = (deployment) => {
-  if (deployment) {
-    const name = process.env.PRODUCTION
-      ? `azure-pg-user`
-      : `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`;
-    const azureSecretSource = new EnvFromSource({
-      secretRef: {
-        name,
-      },
-    });
-    addToEnvFrom({
-      data: [azureSecretSource],
-      deployment,
-    });
+export const addPostgresUserSecret = (deployment?: Deployment): void => {
+  if (!deployment) {
+    return;
   }
+
+  const name = process.env.CI_COMMIT_TAG
+    ? `azure-pg-user`
+    : `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`;
+  const azureSecretSource = new EnvFromSource({
+    secretRef: {
+      name,
+    },
+  });
+  addToEnvFrom({
+    data: [azureSecretSource],
+    deployment,
+  });
 };