Code cleanup

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

internal/commands/push.go

@@ -71,15 +71,19 @@ func runPush(dockerCli command.Cli, name string) error {
 		return err
 	}
 
-	cnabRef := reference.TagNameOnly(ref)
-
 	// Push the bundle
-	dg, err := pushBundle(dockerCli, bndl, cnabRef)
+	dg, err := pushBundle(dockerCli, bndl, ref)
 	if err != nil {
-		return errors.Wrapf(err, "could not push %q", cnabRef)
+		return errors.Wrapf(err, "could not push %q", ref)
+	}
+
+	// we can't just re-use bndl var here, as fixup did rewrite the bundle
+	bndl, err = resolveReferenceAndBundle(bundleStore, ref)
+	if err != nil {
+		return err
 	}
 	bndl.RepoDigest = dg
-	_, err = bundleStore.Store(bndl, cnabRef)
+	_, err = bundleStore.Store(bndl, ref)
 	return err
 }
 

internal/relocated/bundle.go

@@ -50,7 +50,7 @@ func BundleFromFile(filename string) (*Bundle, error) {
 	digestFileName := filepath.Join(filepath.Dir(filename), DigestFilename)
 	dg, err := repoDigest(digestFileName)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to read relocation map")
+		return nil, errors.Wrapf(err, "failed to read digest file")
 	}
 
 	return &Bundle{
@@ -72,14 +72,18 @@ func (b *Bundle) writeRelocationMap(dest string, mode os.FileMode) error {
 // writeRepoDigest store the repo digest to a file as plain text.
 func (b *Bundle) writeRepoDigest(dest string, mode os.FileMode) error {
 	if b.RepoDigest == "" {
-		if _, err := os.Stat(dest); os.IsNotExist(err) {
-			return nil
-		}
-		return os.Remove(dest)
+		return cleanRepoDigest(dest)
 	}
 	return ioutil.WriteFile(dest, []byte(b.RepoDigest), mode)
 }
 
+func cleanRepoDigest(dest string) error {
+	if _, err := os.Stat(dest); os.IsNotExist(err) {
+		return nil
+	}
+	return os.Remove(dest)
+}
+
 // Store a bundle with the relocation map as json files.
 func (b *Bundle) Store(dir string) error {
 	// store bundle.json
@@ -153,9 +157,5 @@ func repoDigest(digestFileName string) (digest.Digest, error) {
 	if err != nil {
 		return "", err
 	}
-	dg, err := digest.Parse(string(bytes))
-	if err != nil {
-		return "", err
-	}
-	return dg, nil
+	return digest.Parse(string(bytes))
 }