Fix -i tag with --image-is-bundle-check flag

carvel-dev · Aug 11, 2023 · d3faea0 · d3faea0
1 parent dce4d45
commit d3faea0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/imgpkg/cmd/pull.go b/pkg/imgpkg/cmd/pull.go
@@ -100,10 +100,15 @@ func (po *PullOptions) Run() error {
 		} else {
 			return fmt.Errorf("Expected bundle flag when pulling a bundle (hint: Use -b instead of -i for bundles)")
 		}
-	} else if pullOpts.IsBundle && errors.Is(err, &v1.ErrIsNotBundle{}) {
-		return fmt.Errorf("Expected bundle image but found plain image (hint: Did you use -i instead of -b?)")
+	} else if errors.Is(err, &v1.ErrIsNotBundle{}) {
+		if pullOpts.IsBundle {
+			return fmt.Errorf("Expected bundle image but found plain image (hint: Did you use -i instead of -b?)")
+		} else {
+			if po.ImageIsBundleCheck {
+				return fmt.Errorf("Expected correct flag with bundle image (hint: Use --image-is-bundle-check=false instead of --image-is-bundle-check=true for images)")
+			}
+		}
 	}
-
 	return err
 }
 

diff --git a/pkg/imgpkg/v1/pull.go b/pkg/imgpkg/v1/pull.go
@@ -119,7 +119,10 @@ func PullWithRegistry(imageRef string, outputPath string, pullOptions PullOpts,
 	case !isBundle && pullOptions.IsBundle: // Trying to pull an Image as a Bundle
 		return PullStatus{}, &ErrIsNotBundle{}
 
-	case !isBundle && !pullOptions.IsBundle: // Trying to pull an OCI Image
+	case !isBundle && !pullOptions.IsBundle && !pullOptions.AsImage: // Trying to pull an OCI Image
+		return PullStatus{}, &ErrIsBundle{}
+
+	case !isBundle && !pullOptions.IsBundle && pullOptions.AsImage: // Trying to pull an OCI Image
 		return pullImage(imageRef, outputPath, pullOptions, reg)
 
 	case isBundle && !pullOptions.IsBundle: // Trying to pull a Bundle as if it where an OCI Image