Skip to content

Commit cc86f69

Browse files
authored
fix: argument handling (#80)
1 parent 610435e commit cc86f69

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

internal/deployment-repo/deploymentRepoManager.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,11 @@ func (m *DeploymentRepoManager) ApplyTemplates(ctx context.Context) error {
270270
return fmt.Errorf("failed to apply fluxcd image automation controller template input: %w", err)
271271
}
272272

273-
err = util.CopyDir(m.ExtraManifestDir, filepath.Join(m.templatesDir, ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
274-
if err != nil {
275-
return fmt.Errorf("failed to copy extra manifests from %s to deployment repository: %w", m.ExtraManifestDir, err)
273+
if len(m.ExtraManifestDir) > 0 {
274+
err = util.CopyDir(m.ExtraManifestDir, filepath.Join(m.templatesDir, ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
275+
if err != nil {
276+
return fmt.Errorf("failed to copy extra manifests from %s to deployment repository: %w", m.ExtraManifestDir, err)
277+
}
276278
}
277279

278280
err = TemplateDir(ctx, m.templatesDir, templateInput, m.compGetter, m.gitRepo)

internal/ocm-cli/component_getter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (g *ComponentGetter) DownloadDirectoryResourceByLocation(ctx context.Contex
162162

163163
cv := rootCV
164164
for _, refName := range referenceNames {
165-
cv, err = g.GetReferencedComponentVersion(ctx, cv, refName)
165+
cv, err = g.GetReferencedComponentVersionRecursive(ctx, cv, refName)
166166
if err != nil {
167167
return fmt.Errorf("error getting referenced component version %s: %w", refName, err)
168168
}

0 commit comments

Comments
 (0)