fix

SocialGouv · Dec 18, 2023 · f4d3bd2 · f4d3bd2
1 parent 9e4c12d
commit f4d3bd2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 36 deletions.
diff --git a/packages/common/utils/async-shell.js b/packages/common/utils/async-shell.js
@@ -66,7 +66,6 @@ module.exports = (
   extraOptions = {}
 ) => {
   const [cmd, args] = parseCommand(arg)
-  logger.pouet(42)
   const defaultOptions = { encoding: "utf-8" }
   const childProcess = spawn(cmd, args, {
     ...defaultOptions,

diff --git a/packages/common/utils/deepmerge.js b/packages/common/utils/deepmerge.js
@@ -1,5 +1,11 @@
 const mergeWith = require("lodash.mergewith")
 
+/**
+ * Helm like deep merge
+ * @param {object} objValue
+ * @param  {...object} srcValues
+ * @returns {object}
+ */
 module.exports = (objValue, ...srcValues) =>
   mergeWith(objValue, ...srcValues, (oValue, srcValue) => {
     if (Array.isArray(oValue)) {

diff --git a/packages/common/utils/direct-logger-factory.js b/packages/common/utils/direct-logger-factory.js
@@ -1,4 +1,4 @@
-const Logger = require("direct-logger")
+const { Logger } = require("direct-logger")
 
 module.exports = (opts = {}) => {
   const { streams = process.stderr } = opts

diff --git a/plugins/contrib/values-compilers/09-maildev.d.ts b/plugins/contrib/values-compilers/09-maildev.d.ts
@@ -42,6 +42,6 @@ export type MailDevValues = {
 
 export type MailDevParams = {
   config: any;
-  //utils: Kontinuous.Utils;
+  utils: keyof Kontinuous.Utils;
   ctx: any;
 };
diff --git a/plugins/contrib/values-compilers/09-maildev.js b/plugins/contrib/values-compilers/09-maildev.js
@@ -5,7 +5,7 @@
  * @return {component is import("./09-maildev").MailDevComponent}
  */
 function isMaildevComponent(component) {
-  return component[`~chart`].endsWith(".contrib.maildev")
+  return component[`~chart`]?.endsWith(".contrib.maildev")
 }
 
 /**
@@ -15,9 +15,9 @@ function isMaildevComponent(component) {
 function extractMaildevComponents(values, acc = []) {
   Object.entries(values).forEach(([key, component]) => {
     if (typeof component === "object" && component !== null) {
-      extractMaildevComponents(values, acc)
-      if (values._isChartValues && isMaildevComponent(values)) {
-        acc.push(values)
+      extractMaildevComponents(component, acc)
+      if (component._isChartValues && isMaildevComponent(component)) {
+        acc.push([key, component])
       }
     }
   })
@@ -30,41 +30,35 @@ function extractMaildevComponents(values, acc = []) {
  * @param {import("./09-maildev").MailDevParams} param2
  * @returns
  */
-const maildev = async (values, _options, { _config, _utils, _ctx }) => {
+const maildev = async (values, _options, { _config, utils, _ctx }) => {
   console.log("maildev", values)
+  const { deepmerge } = utils
 
   const components = extractMaildevComponents(values)
 
-  console.log("component", components)
-  //
-  // todo: find all [`~chart`] === "project.fabrique.contrib.maildev"
-  //
-  Object.entries(values.project.fabrique.contrib).forEach(
-    ([key, component]) => {
-      if (isMaildevComponent(component)) {
-        const persistenceEnabled =
-          component.persistence.enabled !== null
-            ? component.persistence.enabled
-            : !!values.global.env.preprod
+  components.forEach(([key, component]) => {
+    const persistenceEnabled =
+      component.persistence.enabled !== null
+        ? component.persistence.enabled
+        : !!values.global.env.preprod
 
-        component.maildev = {
-          ...component.maildev,
-          host: component.host || `${key}-${values.global.host}`,
-          repositoryName: values.global.repositoryName,
-          ingress: {
-            ...(component.ingress || {}),
-            annotations: values.global.ingress.annotations,
-          },
-          persistence: {
-            enabled: persistenceEnabled,
-          },
-          cron: {
-            enabled: persistenceEnabled,
-          },
-        }
-      }
+    /** @type {import("./09-maildev-schema").MailDevSchema} */
+    const maildevValues = {
+      host: component.host || `${key}-${values.global.host}`,
+      repositoryName: values.global.repositoryName,
+      ingress: {
+        annotations: values.global.ingress.annotations,
+      },
+      persistence: {
+        enabled: persistenceEnabled,
+      },
+      cron: {
+        enabled: persistenceEnabled,
+      },
     }
-  )
+
+    deepmerge(component, maildevValues)
+  })
 }
 
 // @ts-ignore