feat: mergewith

Author: ElderMatt

src/common/repo.ts

@@ -448,8 +448,7 @@ export async function saveResourceGroupToFiles(
         const manifest = renderManifest(fileMap, nodePath, nodeValue)
         console.log('filepath: ', filePath)
         console.log('manifest: ', manifest)
-        const overwrite = manifest.kind === 'AplTeamService' ? true : false
-        await deps.writeValuesToFile(filePath, manifest, overwrite)
+        await deps.writeValuesToFile(filePath, manifest)
       } catch (e) {
         console.log(nodePath)
         console.log(fileMap)

src/common/values.ts

@@ -1,6 +1,6 @@
 import { pathExists } from 'fs-extra'
 import { mkdir, unlink, writeFile } from 'fs/promises'
-import { cloneDeep, get, isEmpty, isEqual, merge, omit, pick, set } from 'lodash'
+import { cloneDeep, get, isEmpty, isEqual, merge, mergeWith, omit, pick, set } from 'lodash'
 import path from 'path'
 import { supportedK8sVersions } from 'src/supportedK8sVersions.json'
 import { stringify } from 'yaml'
@@ -102,6 +102,12 @@ export const getRepo = (values: Record<string, any>): Repo => {
   return { remote, branch, email, username, password }
 }
 
+function mergeCustomizer(prev, next) {
+  console.info('PREVIOUS: ', prev)
+  console.info('NEXT: ', next)
+  return next
+}
+
 let hasSops = false
 /**
  * Writes new values to a file. Will keep the original values if `overwrite` is `false`.
@@ -121,7 +127,7 @@ export const writeValuesToFile = async (
   const values = cloneDeep(inValues)
   const originalValues = (await loadYaml(targetPath + suffix, { noError: true })) ?? {}
   d.debug('originalValues: ', JSON.stringify(originalValues, null, 2))
-  const mergeResult = merge(cloneDeep(originalValues), values)
+  const mergeResult = mergeWith(cloneDeep(originalValues), values, mergeCustomizer)
   const cleanedValues = removeBlankAttributes(values)
   const cleanedMergeResult = removeBlankAttributes(mergeResult)
   if (((overwrite && isEmpty(cleanedValues)) || (!overwrite && isEmpty(cleanedMergeResult))) && isSecretsFile) {

values-changes.yaml

@@ -341,6 +341,6 @@ changes:
       - 'databases.keycloak.imported'
       - 'databases.gitea.imported'
       - 'databases.gitea.useOtomiDB'
-  - version: 34
+  - version: 41
     deletions:
       - 'teamConfig.{team}.services[].type'