feat: improve argocd compatibility with monorepo

src/cmd/apply-as-apps.test.ts

@@ -1,17 +1,18 @@
+import { statSync } from 'fs'
+import { glob } from 'glob'
+import { ARGOCD_APP_PARAMS } from '../common/constants'
+import { env } from '../common/envalid'
 import {
-  applyGitOpsApps,
-  getApplications,
-  applyArgocdApp,
   addGitOpsApps,
-  removeGitOpsApps,
+  applyArgocdApp,
+  applyGitOpsApps,
+  ArgocdAppManifest,
   calculateGitOpsAppsDiff,
+  getApplications,
   getArgocdGitopsManifest,
-  ArgocdAppManifest,
+  getPathsFromSpec,
+  removeGitOpsApps,
 } from './apply-as-apps'
-import { glob } from 'glob'
-import { env } from '../common/envalid'
-import { statSync } from 'fs'
-import { ARGOCD_APP_PARAMS } from '../common/constants'
 
 jest.mock('glob')
 jest.mock('fs', () => ({
@@ -81,6 +82,7 @@ describe('getArgocdGitopsManifest', () => {
         },
         annotations: {
           'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
+          'argocd.argoproj.io/manifest-generate-paths': '/env/manifests/global',
         },
         finalizers: ['resources-finalizer.argocd.argoproj.io'],
       },
@@ -124,6 +126,7 @@ describe('getArgocdGitopsManifest', () => {
         },
         annotations: {
           'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
+          'argocd.argoproj.io/manifest-generate-paths': '/env/manifests/ns/my-namespace',
         },
         finalizers: ['resources-finalizer.argocd.argoproj.io'],
       },
@@ -152,6 +155,38 @@ describe('getArgocdGitopsManifest', () => {
   })
 })
 
+describe('getPathsFromSpec', () => {
+  it('should normalize source.path by prepending slash when missing', () => {
+    const paths = getPathsFromSpec({ source: { path: 'charts/my-app' } })
+    expect(paths).toBe('/charts/my-app')
+  })
+
+  it('should keep source.path unchanged when it already starts with slash', () => {
+    const paths = getPathsFromSpec({ source: { path: '/charts/my-app' } })
+    expect(paths).toBe('/charts/my-app')
+  })
+
+  it('should return normalized semicolon-separated paths for sources', () => {
+    const paths = getPathsFromSpec({
+      sources: [{ path: 'env/manifests/global' }, { path: '/env/manifests/ns/team-a' }],
+    })
+    expect(paths).toBe('/env/manifests/global;/env/manifests/ns/team-a')
+  })
+
+  it('should ignore non-string and empty source paths', () => {
+    const paths = getPathsFromSpec({
+      sources: [{ path: 'env/manifests/global' }, { path: '' }, { path: 123 }, { path: null }, {}],
+    })
+    expect(paths).toBe('/env/manifests/global')
+  })
+
+  it('should return undefined when no valid path exists', () => {
+    expect(getPathsFromSpec({})).toBeUndefined()
+    expect(getPathsFromSpec({ source: { path: 123 } })).toBeUndefined()
+    expect(getPathsFromSpec({ sources: [{ path: '' }, { path: null }] })).toBeUndefined()
+  })
+})
+
 describe('applyArgoCdApp', () => {
   const mockManifest: ArgocdAppManifest = {
     apiVersion: 'argoproj.io/v1alpha1',

src/cmd/apply-as-apps.ts

@@ -5,9 +5,9 @@
   setHeaderOptions,
   V1ResourceRequirements,
 } from '@kubernetes/client-node'
-import { existsSync, statSync, mkdirSync, rmSync } from 'fs'
-import { glob } from 'glob'
+import { existsSync, mkdirSync, rmSync, statSync } from 'fs'
 import { readFile } from 'fs/promises'
+import { glob } from 'glob'
 import { appPatches, genericPatch } from 'src/applicationPatches.json'
 import { cleanupHandler, prepareEnvironment } from 'src/common/cli'
 import { logLevelString, terminal } from 'src/common/debug'
@@ -93,7 +93,35 @@
   return `${release.namespace}-${release.name}`
 }
 
+const normalizeArgoSourcePath = (path: string): string => {
+  if (!path) return path
+  return path.startsWith('/') ? path : `/${path}`
+}
+
+export const getPathsFromSpec = (spec: Record<string, any>): string | undefined => {
+  if (typeof spec?.source?.path === 'string' && spec.source.path.length > 0) {
+    return normalizeArgoSourcePath(spec.source.path)
+  }
+  if (spec?.sources && Array.isArray(spec.sources)) {
+    const normalizedPaths = spec.sources
+      .map((source: { path?: string }) => source?.path)
+      .filter((path): path is string => typeof path === 'string' && path.length > 0)
+      .map((path: string) => normalizeArgoSourcePath(path))
+    return normalizedPaths.length > 0 ? normalizedPaths.join(';') : undefined
+  }
+
+  return undefined
+}
+
 const getArgoCdAppManifest = (name: string, appLabel: string, spec: Record<string, any>): ArgocdAppManifest => {
+  const annotations = {
+    'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
+  }
+  const paths = getPathsFromSpec(spec)
+  if (paths) {
+    annotations['argocd.argoproj.io/manifest-generate-paths'] = paths
+  }
+
   return {
     apiVersion: 'argoproj.io/v1alpha1',
     kind: 'Application',
@@ -103,9 +131,7 @@
         'otomi.io/app': appLabel,
       },
       namespace: 'argocd',
-      annotations: {
-        'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
-      },
+      annotations,
       finalizers: ['resources-finalizer.argocd.argoproj.io'],
     },
     spec,
@@ -119,12 +145,13 @@
 ): ArgocdAppManifest => {
   const name = getAppName(release)
   const patch = (appPatches[name] || genericPatch) as Record<string, any>
+  const chartPath = release.chart.replace('../', '')
   return getArgoCdAppManifest(name, ARGOCD_APP_DEFAULT_LABEL, {
     syncPolicy: ARGOCD_APP_DEFAULT_SYNC_POLICY,
     project: 'default',
     revisionHistoryLimit: 2,
     source: {
-      path: release.chart.replace('../', ''),
+      path: chartPath,
       repoURL: env.APPS_REPO_URL,
       targetRevision: env.APPS_REVISION || otomiVersion,
       helm: {