Remove all existing (potentially obsolete) ..links files during reind…

…exing.
ArtifactDB · Jan 27, 2025 · e273e5c · e273e5c
1 parent b94c02d
commit e273e5c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/transfer.go b/transfer.go
@@ -541,6 +541,12 @@ func reindexDirectory(registry, project, asset, version string) error {
             if info.IsDir() {
                 return filepath.SkipDir
             } else {
+                if base == linksFileName {
+                    err := os.Remove(src_path)
+                    if err != nil {
+                        return fmt.Errorf("failed to remove old ..links file at %q; %w", src_path, err)
+                    }
+                }
                 return nil
             }
         }

diff --git a/transfer_test.go b/transfer_test.go
@@ -1156,6 +1156,31 @@ func TestReindexDirectorySimple(t *testing.T) {
     if err != nil {
         t.Fatal(err)
     }
+
+    // What happens if we inject a ..links file in there?
+    lpath := filepath.Join(v_path, linksFileName)
+    err = os.WriteFile(lpath, []byte{}, 0644)
+    if err != nil {
+        t.Fatal(err)
+    }
+
+    lpath2 := filepath.Join(v_path, "moves", "electric", linksFileName)
+    err = os.WriteFile(lpath2, []byte{}, 0644)
+    if err != nil {
+        t.Fatal(err)
+    }
+
+    err = reindexDirectory(reg, project, asset, version)
+    if err != nil {
+        t.Fatalf("failed to reindex directory; %v", err)
+    }
+
+    if _, err := os.Stat(lpath); err == nil || !errors.Is(err, os.ErrNotExist) {
+        t.Error("expected existing ..links file to be deleted")
+    }
+    if _, err := os.Stat(lpath2); err == nil || !errors.Is(err, os.ErrNotExist) {
+        t.Error("expected existing nested ..links file to be deleted")
+    }
 }
 
 func TestReindexDirectorySkipHidden(t *testing.T) {
@@ -1314,6 +1339,17 @@ func TestReindexDirectoryRegistryLinks(t *testing.T) {
     if err != nil {
         t.Fatal(err)
     }
+
+    // Confirming that we have ..links files.
+    _, found := recovered[linksFileName]
+    if !found {
+        t.Error("missing a top-level ..links file")
+    }
+
+    _, found = recovered[filepath.Join("moves", "electric", linksFileName)]
+    if !found {
+        t.Error("missing a nested ..links file")
+    }
 }
 
 func TestReindexDirectoryRegistryLinkFailures(t *testing.T) {