From 791436b6f4940114ce2676b88976acdb4c72c881 Mon Sep 17 00:00:00 2001 From: Darcy Cleaver Date: Thu, 22 Feb 2024 13:34:06 -0700 Subject: [PATCH 1/2] fix: relative paths for bundle create --- src/pkg/bundle/common.go | 5 +++++ src/test/bundles/03-local-and-remote/uds-bundle.yaml | 2 +- src/test/bundles/04-init/uds-bundle.yaml | 2 +- src/test/bundles/05-gitrepo/uds-bundle.yaml | 2 +- src/test/bundles/07-helm-overrides/uds-bundle.yaml | 2 +- src/test/bundles/08-var-precedence/uds-bundle.yaml | 4 ++-- src/test/bundles/09-uds-bundle-yml/uds-bundle.yml | 2 +- src/test/bundles/11-real-simple/uds-bundle.yaml | 2 +- src/test/bundles/12-exported-pkg-vars/uds-bundle.yaml | 2 +- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/pkg/bundle/common.go b/src/pkg/bundle/common.go index 8ff40dbb..6397f7ee 100644 --- a/src/pkg/bundle/common.go +++ b/src/pkg/bundle/common.go @@ -104,6 +104,11 @@ func (b *Bundle) ValidateBundleResources(bundle *types.UDSBundle, spinner *messa // validate access to packages as well as components referenced in the package for idx, pkg := range bundle.Packages { + // if package path is set, make it relative to source directory + if pkg.Path != "" { + pkg.Path = fmt.Sprintf("%s/%s", b.cfg.CreateOpts.SourceDirectory, pkg.Path) + } + spinner.Updatef("Validating Bundle Package: %s", pkg.Name) if pkg.Name == "" { return fmt.Errorf("%s is missing required field: name", pkg) diff --git a/src/test/bundles/03-local-and-remote/uds-bundle.yaml b/src/test/bundles/03-local-and-remote/uds-bundle.yaml index d9eea763..feb0adc1 100644 --- a/src/test/bundles/03-local-and-remote/uds-bundle.yaml +++ b/src/test/bundles/03-local-and-remote/uds-bundle.yaml @@ -9,5 +9,5 @@ packages: repository: ghcr.io/defenseunicorns/uds-cli/nginx ref: 0.0.1 - name: podinfo - path: "src/test/packages/podinfo" + path: "../../packages/podinfo" ref: 0.0.1 diff --git a/src/test/bundles/04-init/uds-bundle.yaml b/src/test/bundles/04-init/uds-bundle.yaml index 72588984..45641682 100644 --- a/src/test/bundles/04-init/uds-bundle.yaml +++ b/src/test/bundles/04-init/uds-bundle.yaml @@ -8,7 +8,7 @@ metadata: # cannot do uds remove on this pkg due to having the same name packages: - name: init - path: "src/test/packages" + path: "../../packages" # renovate: datasource=github-tags depName=defenseunicorns/zarf ref: v0.32.3 optionalComponents: diff --git a/src/test/bundles/05-gitrepo/uds-bundle.yaml b/src/test/bundles/05-gitrepo/uds-bundle.yaml index 7cd86d97..835039dd 100644 --- a/src/test/bundles/05-gitrepo/uds-bundle.yaml +++ b/src/test/bundles/05-gitrepo/uds-bundle.yaml @@ -6,5 +6,5 @@ metadata: packages: - name: gitrepo - path: "src/test/packages/gitrepo" + path: "../../packages/gitrepo" ref: 0.0.1 diff --git a/src/test/bundles/07-helm-overrides/uds-bundle.yaml b/src/test/bundles/07-helm-overrides/uds-bundle.yaml index 73689822..a0019dc3 100644 --- a/src/test/bundles/07-helm-overrides/uds-bundle.yaml +++ b/src/test/bundles/07-helm-overrides/uds-bundle.yaml @@ -6,7 +6,7 @@ metadata: packages: - name: helm-overrides - path: "src/test/packages/helm" + path: "../../packages/helm" ref: 0.0.1 overrides: diff --git a/src/test/bundles/08-var-precedence/uds-bundle.yaml b/src/test/bundles/08-var-precedence/uds-bundle.yaml index 1b98f24d..3608b58d 100644 --- a/src/test/bundles/08-var-precedence/uds-bundle.yaml +++ b/src/test/bundles/08-var-precedence/uds-bundle.yaml @@ -6,7 +6,7 @@ metadata: packages: - name: helm-overrides - path: "src/test/packages/helm" + path: "../../packages/helm" ref: 0.0.1 overrides: podinfo-component: @@ -22,5 +22,5 @@ packages: default: "uds.dev" - name: output-var - path: "src/test/packages/no-cluster/output-var" + path: "../../packages/no-cluster/output-var" ref: 0.0.1 diff --git a/src/test/bundles/09-uds-bundle-yml/uds-bundle.yml b/src/test/bundles/09-uds-bundle-yml/uds-bundle.yml index 49726eae..ae397f99 100644 --- a/src/test/bundles/09-uds-bundle-yml/uds-bundle.yml +++ b/src/test/bundles/09-uds-bundle-yml/uds-bundle.yml @@ -6,5 +6,5 @@ metadata: packages: - name: nginx - path: "src/test/packages/nginx" + path: "../../packages/nginx" ref: 0.0.1 diff --git a/src/test/bundles/11-real-simple/uds-bundle.yaml b/src/test/bundles/11-real-simple/uds-bundle.yaml index 6e17114f..a5aa4406 100644 --- a/src/test/bundles/11-real-simple/uds-bundle.yaml +++ b/src/test/bundles/11-real-simple/uds-bundle.yaml @@ -5,5 +5,5 @@ metadata: packages: - name: real-simple - path: "src/test/packages/no-cluster/real-simple" + path: "../../packages/no-cluster/real-simple" ref: 0.0.1 diff --git a/src/test/bundles/12-exported-pkg-vars/uds-bundle.yaml b/src/test/bundles/12-exported-pkg-vars/uds-bundle.yaml index b22c7275..e2bcc606 100644 --- a/src/test/bundles/12-exported-pkg-vars/uds-bundle.yaml +++ b/src/test/bundles/12-exported-pkg-vars/uds-bundle.yaml @@ -15,7 +15,7 @@ packages: - name: BOOL - name: helm-overrides - path: "src/test/packages/helm" + path: "../../packages/helm" ref: 0.0.1 imports: - name: COLOR From 57f038b20ba6b23fdd5c5e681411b7157588983c Mon Sep 17 00:00:00 2001 From: decleaver <85503726+decleaver@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:02:29 -0700 Subject: [PATCH 2/2] Update src/pkg/bundle/common.go Co-authored-by: UncleGedd <42304551+UncleGedd@users.noreply.github.com> --- src/pkg/bundle/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkg/bundle/common.go b/src/pkg/bundle/common.go index 6397f7ee..2095af3b 100644 --- a/src/pkg/bundle/common.go +++ b/src/pkg/bundle/common.go @@ -106,7 +106,7 @@ func (b *Bundle) ValidateBundleResources(bundle *types.UDSBundle, spinner *messa for idx, pkg := range bundle.Packages { // if package path is set, make it relative to source directory if pkg.Path != "" { - pkg.Path = fmt.Sprintf("%s/%s", b.cfg.CreateOpts.SourceDirectory, pkg.Path) + pkg.Path = filepath.Join(b.cfg.CreateOpts.SourceDirectory, pkg.Path) } spinner.Updatef("Validating Bundle Package: %s", pkg.Name)