Skip to content

fix(cnbBuild): Improved error handling #5577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
modulo11 merged 2 commits into from
Dec 10, 2025
Merged

fix(cnbBuild): Improved error handling #5577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c5ae6
fix(cnbBuild): Improved error handling
c0d1ngm0nk3y Dec 5, 2025
943446a
Fix cnbBuild integrationtest
loewenstein-sap Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions cmd/cnbBuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,12 @@ func isBuilder(utils cnbutils.BuildUtils) error {
return nil
}

func isZip(path string) bool {
func verifyZip(path string) error {
r, err := zip.OpenReader(path)

switch {
case err == nil:
if err == nil {
_ = r.Close()
return true
case err == zip.ErrFormat:
return false
default:
return false
}
return err
}

func cleanDir(dir string, utils cnbutils.BuildUtils) error {
Expand All @@ -169,13 +163,14 @@ func cleanDir(dir string, utils cnbutils.BuildUtils) error {
}

func extractZip(source, target string) error {
if !isZip(source) {
err := verifyZip(source)
if err != nil {
log.SetErrorCategory(log.ErrorBuild)
return errors.New("application path must be a directory or zip")
return errors.Wrapf(err, "'%s' is not a valid archive", source)
}

log.Entry().Infof("Extracting archive '%s' to '%s'", source, target)
_, err := piperutils.Unzip(source, target)
_, err = piperutils.Unzip(source, target)
if err != nil {
log.SetErrorCategory(log.ErrorBuild)
return errors.Wrapf(err, "Extracting archive '%s' to '%s' failed", source, target)
Expand Down
2 changes: 1 addition & 1 deletion integration/integration_cnb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func TestCNBIntegrationNonZipPath(t *testing.T) {
err := container.whenRunningPiperCommand("cnbBuild", "--noTelemetry", "--verbose", "--containerImageName", "not-found", "--containerImageTag", "0.0.1", "--containerRegistryUrl", registryURL, "--path", "mta.yaml")
assert.Error(t, err)

container.assertHasOutput(t, "Copying '/project/mta.yaml' into '/workspace' failed: application path must be a directory or zip")
container.assertHasOutput(t, "Copying '/project/mta.yaml' into '/workspace' failed: '/project/mta.yaml' is not a valid archive: zip: not a valid zip file")
container.terminate(t)
}

Expand Down
Loading