fixes after rebase

Author: CamrynCarter

cmd/hauler/cli/store/add.go

@@ -1180,21 +1180,22 @@ func fetchChart(ctx context.Context, s *store.Layout, j chartJob, tempRoot strin
 		return nil, nil, err
 	}
 
-	if j.rewrite != "" {
-		if err := rewriteChartReference(ctx, s, ref, j.rewrite); err != nil {
-			return nil, nil, err
-		}
-	}
-
 	// Charts have no registry-qualified annotation the way images do (via
 	// ContainerdImageNameKey), and RepoURL is otherwise never persisted anywhere in
 	// the store, so capture both here to maintain provenance regardless of whether
-	// --rewrite is ever applied.
+	// --rewrite is ever applied. This must happen before rewriteChartReference so its
+	// retag of AnnotationRefName isn't clobbered by re-adding a pre-rewrite chartDesc.
 	chartDesc.Annotations[consts.OriginalRefAnnotation] = encodeOriginalChartRef(j.cfg.RepoURL, ref.Name())
 	if err := s.OCI.AddIndex(chartDesc); err != nil {
 		return nil, nil, err
 	}
 
+	if j.rewrite != "" {
+		if err := rewriteChartReference(ctx, s, ref, j.rewrite); err != nil {
+			return nil, nil, err
+		}
+	}
+
 	if auditLevel(ro) != "none" {
 		e := audit.Entry{
 			StoreID:   s.StoreID,

pkg/store/store_test.go

@@ -913,7 +913,7 @@ func TestAddImage_OriginalRefAnnotation(t *testing.T) {
 		if err != nil {
 			t.Fatalf("new layout: %v", err)
 		}
-		if _, err := s.AddImage(context.Background(), tag.Name(), "", false, remoteOpts...); err != nil {
+		if _, err := s.AddImage(context.Background(), tag.Name(), "", false, "", false, "", remoteOpts...); err != nil {
 			t.Fatalf("AddImage: %v", err)
 		}
 
@@ -970,7 +970,7 @@ func TestAddImage_OriginalRefAnnotation(t *testing.T) {
 		if err != nil {
 			t.Fatalf("new layout: %v", err)
 		}
-		if _, err := s.AddImage(context.Background(), tag.Name(), "", false, remoteOpts...); err != nil {
+		if _, err := s.AddImage(context.Background(), tag.Name(), "", false, "", false, "", remoteOpts...); err != nil {
 			t.Fatalf("AddImage: %v", err)
 		}