Merge pull request #276 from buildpacks/error-message-fixes

warn/error message cleanup
buildpacks · Mar 17, 2020 · d24e82d · d24e82d
2 parents 5b93bbc + 1a519a0
commit d24e82d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
   test-and-build:
     runs-on: ubuntu-latest
     env:
-      LIFECYCLE_VERSION: 0.7.1
+      LIFECYCLE_VERSION: 0.7.2
     steps:
       - uses: actions/checkout@v2
       - name: Set up go

diff --git a/cmd/lifecycle/analyzer.go b/cmd/lifecycle/analyzer.go
@@ -57,6 +57,9 @@ func (a *analyzeCmd) Args(nargs int, args []string) error {
 	if args[0] == "" {
 		return cmd.FailErrCode(errors.New("image argument is required"), cmd.CodeInvalidArgs, "parse arguments")
 	}
+	if a.cacheImageTag == "" && a.cacheDir == "" {
+		cmd.Logger.Warn("Not restoring cached layer metadata, no cache flag specified.")
+	}
 	a.imageName = args[0]
 	return nil
 }

diff --git a/cmd/lifecycle/creator.go b/cmd/lifecycle/creator.go
@@ -70,7 +70,7 @@ func (c *createCmd) Args(nargs int, args []string) error {
 	}
 
 	if c.cacheImageTag == "" && c.cacheDir == "" {
-		cmd.Logger.Warn("Not restoring cached layer data, no cache flag specified.")
+		cmd.Logger.Warn("Not restoring or caching layer data, no cache flag specified.")
 	}
 
 	if c.previousImage == "" {

diff --git a/cmd/lifecycle/exporter.go b/cmd/lifecycle/exporter.go
@@ -82,7 +82,7 @@ func (e *exportCmd) Args(nargs int, args []string) error {
 	}
 
 	if e.cacheImageTag == "" && e.cacheDir == "" {
-		cmd.Logger.Warn("Not restoring cached layer data, no cache flag specified.")
+		cmd.Logger.Warn("Will not cache data, no cache flag specified.")
 	}
 
 	if err := image.EnsureSingleRegistry(e.imageNames...); err != nil {
@@ -330,9 +330,8 @@ func resolveStack(stackPath, runImageRef, registry string) (lifecycle.StackMetad
 	}
 	if runImageRef == "" {
 		if stackMD.RunImage.Image == "" {
-			return lifecycle.StackMetadata{}, "", cmd.FailErrCode(errors.New("-image is required when there is no stack metadata available"), cmd.CodeInvalidArgs, "parse arguments")
+			return lifecycle.StackMetadata{}, "", cmd.FailErrCode(errors.New("-run-image is required when there is no stack metadata available"), cmd.CodeInvalidArgs, "parse arguments")
 		}
-
 		runImageRef, err = stackMD.BestRunImageMirror(registry)
 		if err != nil {
 			return lifecycle.StackMetadata{}, "", err