fixes #386

Signed-off-by: ktpv <ktpv@users.noreply.github.com>
buildpacks · Dec 6, 2019 · 60316ea · 60316ea
1 parent 621d70c
commit 60316ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/internal/commands/inspect_builder.go b/internal/commands/inspect_builder.go
@@ -36,28 +36,33 @@ func InspectBuilder(logger logging.Logger, cfg config.Config, client PackClient)
 				imageName = args[0]
 			}
 
+			remoteOutput, remoteWarnings, remoteErr := inspectBuilderOutput(client, cfg, imageName, false)
+			localOutput, localWarnings, localErr := inspectBuilderOutput(client, cfg, imageName, true)
+
+			if remoteOutput == "(not present)" && localOutput == "(not present)" {
+				return errors.New(fmt.Sprintf("Unable to find builder '%s' locally or remotely.\n", imageName))
+			}
+
 			if imageName == cfg.DefaultBuilder {
 				logger.Infof("Inspecting default builder: %s\n", style.Symbol(imageName))
 			} else {
 				logger.Infof("Inspecting builder: %s\n", style.Symbol(imageName))
 			}
 
-			remoteOutput, warnings, err := inspectBuilderOutput(client, cfg, imageName, false)
-			if err != nil {
-				logger.Error(err.Error())
+			if remoteErr != nil {
+				logger.Error(remoteErr.Error())
 			} else {
 				logger.Infof("\nREMOTE:\n%s\n", remoteOutput)
-				for _, w := range warnings {
+				for _, w := range remoteWarnings {
 					logger.Warn(w)
 				}
 			}
 
-			localOutput, warnings, err := inspectBuilderOutput(client, cfg, imageName, true)
-			if err != nil {
-				logger.Error(err.Error())
+			if localErr != nil {
+				logger.Error(localErr.Error())
 			} else {
 				logger.Infof("\nLOCAL:\n%s\n", localOutput)
-				for _, w := range warnings {
+				for _, w := range localWarnings {
 					logger.Warn(w)
 				}
 			}

diff --git a/internal/commands/inspect_builder_test.go b/internal/commands/inspect_builder_test.go
@@ -60,14 +60,12 @@ func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 
 	when("#Get", func() {
 		when("image cannot be found", func() {
-			it("logs 'Not present'", func() {
+			it("logs 'ERROR Unable'", func() {
 				mockClient.EXPECT().InspectBuilder("some/image", false).Return(nil, nil)
 				mockClient.EXPECT().InspectBuilder("some/image", true).Return(nil, nil)
 
 				command.SetArgs([]string{"some/image"})
-				h.AssertNil(t, command.Execute())
-
-				h.AssertContains(t, outBuf.String(), "REMOTE:\n(not present)\n\nLOCAL:\n(not present)\n")
+				h.AssertError(t, command.Execute(), `Unable to find builder 'some/image' locally or remotely.`)
 			})
 		})