From a87e12e6cd609f43fe77f1753ad8ab61210325ae Mon Sep 17 00:00:00 2001 From: Natalie Arellano Date: Thu, 11 Jul 2024 09:34:05 -0400 Subject: [PATCH] Surface registry error (#1376) * Surface registry error instead of logging it as debug When permissions issues are encountered, it can be hard to determine the root cause without the error returned from the registry Signed-off-by: Natalie Arellano * Fix test expectation Signed-off-by: Natalie Arellano --------- Signed-off-by: Natalie Arellano --- acceptance/analyzer_test.go | 2 +- image/registry_handler.go | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/acceptance/analyzer_test.go b/acceptance/analyzer_test.go index 37e0345f5..92e9d487f 100644 --- a/acceptance/analyzer_test.go +++ b/acceptance/analyzer_test.go @@ -450,7 +450,7 @@ func testAnalyzerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe output, err := cmd.CombinedOutput() h.AssertNotNil(t, err) - expected := "validating registry write access: ensure registry read/write access to " + analyzeRegFixtures.InaccessibleImage + expected := "ensure registry read/write access to " + analyzeRegFixtures.InaccessibleImage h.AssertStringContains(t, string(output), expected) }) }) diff --git a/image/registry_handler.go b/image/registry_handler.go index cbfcd563d..2bf11056e 100644 --- a/image/registry_handler.go +++ b/image/registry_handler.go @@ -1,12 +1,11 @@ package image import ( + "fmt" + "github.com/buildpacks/imgutil" "github.com/buildpacks/imgutil/remote" "github.com/google/go-containerregistry/pkg/authn" - "github.com/pkg/errors" - - "github.com/buildpacks/lifecycle/cmd" ) // RegistryHandler takes care of the registry settings and checks @@ -73,8 +72,7 @@ func verifyReadAccess(imageRef string, keychain authn.Keychain, opts []imgutil.I img, _ := remote.NewImage(imageRef, keychain, opts...) canRead, err := img.CheckReadAccess() if !canRead { - cmd.DefaultLogger.Debugf("Error checking read access: %s", err) - return errors.Errorf("ensure registry read access to %s", imageRef) + return fmt.Errorf("failed to ensure registry read access to %s: %w", imageRef, err) } return nil @@ -88,8 +86,7 @@ func verifyReadWriteAccess(imageRef string, keychain authn.Keychain, opts []imgu img, _ := remote.NewImage(imageRef, keychain, opts...) canReadWrite, err := img.CheckReadWriteAccess() if !canReadWrite { - cmd.DefaultLogger.Debugf("Error checking read/write access: %s", err) - return errors.Errorf("ensure registry read/write access to %s", imageRef) + return fmt.Errorf("failed to ensure registry read/write access to %s: %w", imageRef, err) } return nil }