ref: add hash to name

Author: OliverTrautvetter

cli/cmd/download_package.go

@@ -100,7 +100,11 @@ func (c *DownloadPackageCmd) DownloadBuild(p portal.Portal, build portal.Build,
 		return fmt.Errorf("failed to find artifact in package: %w", err)
 	}
 
-	fullFilename := strings.ReplaceAll(build.Version, "/", "-") + "-" + filename
+	shortHash := build.Hash
+	if len(shortHash) > 10 {
+		shortHash = shortHash[:10]
+	}
+	fullFilename := strings.ReplaceAll(build.Version, "/", "-") + "-" + shortHash + "-" + filename
 	out, err := c.FileWriter.OpenAppend(fullFilename)
 	if err != nil {
 		out, err = c.FileWriter.Create(fullFilename)
@@ -133,13 +137,5 @@ func (c *DownloadPackageCmd) DownloadBuild(p portal.Portal, build portal.Build,
 		return fmt.Errorf("failed to verify artifact: %w", err)
 	}
 
-	if download.Artifacts[0].Md5Sum != "" {
-		checksumFilename := fullFilename + ".md5"
-		err = c.FileWriter.WriteFile(checksumFilename, []byte(download.Artifacts[0].Md5Sum), 0644)
-		if err != nil {
-			log.Printf("Warning: failed to save checksum file: %v", err)
-		}
-	}
-
 	return nil
 }

cli/cmd/download_package_test.go

@@ -22,6 +22,7 @@ var _ = Describe("DownloadPackages", func() {
 		c              cmd.DownloadPackageCmd
 		filename       string
 		version        string
+		hash           string
 		build          portal.Build
 		mockPortal     *portal.MockPortal
 		mockFileWriter *util.MockFileIO
@@ -30,6 +31,7 @@ var _ = Describe("DownloadPackages", func() {
 	BeforeEach(func() {
 		filename = "installer.tar.gz"
 		version = "codesphere-1.42.0"
+		hash = "abc1234567"
 		mockPortal = portal.NewMockPortal(GinkgoT())
 		mockFileWriter = util.NewMockFileIO(GinkgoT())
 	})
@@ -44,6 +46,7 @@ var _ = Describe("DownloadPackages", func() {
 		}
 		build = portal.Build{
 			Version: version,
+			Hash:    hash,
 			Artifacts: []portal.Artifact{
 				{Filename: filename},
 				{Filename: "otherFilename.tar.gz"},
@@ -169,43 +172,45 @@ var _ = Describe("DownloadPackages", func() {
 		It("Downloads the correct artifact to the correct output file", func() {
 			expectedBuildToDownload := portal.Build{
 				Version: version,
+				Hash:    hash,
 				Artifacts: []portal.Artifact{
 					{Filename: filename},
 				},
 			}
 
 			fakeFile := os.NewFile(uintptr(0), filename)
-			mockFileWriter.EXPECT().OpenAppend(version+"-"+filename).Return(fakeFile, nil)
-			mockFileWriter.EXPECT().Open(version+"-"+filename).Return(fakeFile, nil)
+			mockFileWriter.EXPECT().OpenAppend(version+"-"+hash+"-"+filename).Return(fakeFile, nil)
+			mockFileWriter.EXPECT().Open(version+"-"+hash+"-"+filename).Return(fakeFile, nil)
 			mockPortal.EXPECT().DownloadBuildArtifact(portal.CodesphereProduct, expectedBuildToDownload, mock.Anything, 0, false).Return(nil)
 			mockPortal.EXPECT().VerifyBuildArtifactDownload(mock.Anything, expectedBuildToDownload).Return(nil)
 			err := c.DownloadBuild(mockPortal, build, filename)
 			Expect(err).NotTo(HaveOccurred())
 		})
 
-		It("Saves MD5 checksum to sidecar file when available", func() {
-			md5Sum := "d41d8cd98f00b204e9800998ecf8427e"
-			buildWithMd5 := portal.Build{
+		It("Truncates long hash to 10 characters in filename", func() {
+			longHash := "abc1234567890defghij"
+			buildWithLongHash := portal.Build{
 				Version: version,
+				Hash:    longHash,
 				Artifacts: []portal.Artifact{
-					{Filename: filename, Md5Sum: md5Sum},
+					{Filename: filename},
 					{Filename: "otherFilename.tar.gz"},
 				},
 			}
 			expectedBuildToDownload := portal.Build{
 				Version: version,
+				Hash:    longHash,
 				Artifacts: []portal.Artifact{
-					{Filename: filename, Md5Sum: md5Sum},
+					{Filename: filename},
 				},
 			}
 
 			fakeFile := os.NewFile(uintptr(0), filename)
-			mockFileWriter.EXPECT().OpenAppend(version+"-"+filename).Return(fakeFile, nil)
-			mockFileWriter.EXPECT().Open(version+"-"+filename).Return(fakeFile, nil)
-			mockFileWriter.EXPECT().WriteFile(version+"-"+filename+".md5", []byte(md5Sum), os.FileMode(0644)).Return(nil)
+			mockFileWriter.EXPECT().OpenAppend(version+"-abc1234567-"+filename).Return(fakeFile, nil)
+			mockFileWriter.EXPECT().Open(version+"-abc1234567-"+filename).Return(fakeFile, nil)
 			mockPortal.EXPECT().DownloadBuildArtifact(portal.CodesphereProduct, expectedBuildToDownload, mock.Anything, 0, false).Return(nil)
 			mockPortal.EXPECT().VerifyBuildArtifactDownload(mock.Anything, expectedBuildToDownload).Return(nil)
-			err := c.DownloadBuild(mockPortal, buildWithMd5, filename)
+			err := c.DownloadBuild(mockPortal, buildWithLongHash, filename)
 			Expect(err).NotTo(HaveOccurred())
 		})
 
@@ -216,14 +221,15 @@ var _ = Describe("DownloadPackages", func() {
 			It("Downloads the correct artifact to the correct output file", func() {
 				expectedBuildToDownload := portal.Build{
 					Version: version,
+					Hash:    hash,
 					Artifacts: []portal.Artifact{
 						{Filename: filename},
 					},
 				}
 
 				fakeFile := os.NewFile(uintptr(0), filename)
-				mockFileWriter.EXPECT().OpenAppend("other-version-v1.42.0-"+filename).Return(fakeFile, nil)
-				mockFileWriter.EXPECT().Open("other-version-v1.42.0-"+filename).Return(fakeFile, nil)
+				mockFileWriter.EXPECT().OpenAppend("other-version-v1.42.0-"+hash+"-"+filename).Return(fakeFile, nil)
+				mockFileWriter.EXPECT().Open("other-version-v1.42.0-"+hash+"-"+filename).Return(fakeFile, nil)
 				mockPortal.EXPECT().DownloadBuildArtifact(portal.CodesphereProduct, expectedBuildToDownload, mock.Anything, 0, false).Return(nil)
 				mockPortal.EXPECT().VerifyBuildArtifactDownload(mock.Anything, expectedBuildToDownload).Return(nil)
 				err := c.DownloadBuild(mockPortal, build, filename)

internal/installer/package.go

@@ -17,7 +17,6 @@ import (
 
 const depsDir = "deps"
 const depsTar = "deps.tar.gz"
-const checksumMarkerFile = ".oms-package-checksum"
 
 type PackageManager interface {
 	FileIO() util.FileIO
@@ -74,52 +73,8 @@ func (p *Package) alreadyExtracted(dir string) (bool, error) {
 	return isDir, nil
 }
 
-func (p *Package) getPackageChecksum() string {
-	data, err := p.fileIO.ReadFile(p.Filename + ".md5")
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func (p *Package) getExtractedChecksum(workDir string) string {
-	data, err := p.fileIO.ReadFile(path.Join(workDir, checksumMarkerFile))
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func (p *Package) saveExtractedChecksum(workDir, checksum string) error {
-	if checksum == "" {
-		return nil
-	}
-	return p.fileIO.WriteFile(path.Join(workDir, checksumMarkerFile), []byte(checksum), 0644)
-}
-
-func (p *Package) packageChanged(workDir string) bool {
-	packageChecksum := p.getPackageChecksum()
-	if packageChecksum == "" {
-		return false
-	}
-
-	extractedChecksum := p.getExtractedChecksum(workDir)
-	if extractedChecksum == "" {
-		log.Println("No checksum marker found in extracted directory, will re-extract to ensure consistency.")
-		return true
-	}
-
-	if packageChecksum != extractedChecksum {
-		log.Printf("Package checksum changed (was: %s, now: %s), will re-extract.", extractedChecksum, packageChecksum)
-		return true
-	}
-
-	return false
-}
-
 // Extract extracts the package tar.gz file into its working directory.
 // If force is true, it will overwrite existing files.
-// If the package checksum has changed since last extraction, it will also re-extract.
 func (p *Package) Extract(force bool) error {
 	workDir := p.GetWorkDir()
 	err := os.MkdirAll(p.OmsWorkdir, 0755)
@@ -132,18 +87,11 @@ func (p *Package) Extract(force bool) error {
 		return fmt.Errorf("failed to figure out if package %s is already extracted in %s: %w", p.Filename, workDir, err)
 	}
 
-	// Check if the package has changed since last extraction
-	needsReExtraction := p.packageChanged(workDir)
-
-	if alreadyExtracted && !force && !needsReExtraction {
+	if alreadyExtracted && !force {
 		log.Println("Skipping extraction, package already unpacked. Use force option to overwrite.")
 		return nil
 	}
 
-	if needsReExtraction && !force {
-		log.Println("Package has changed, re-extracting...")
-	}
-
 	err = util.ExtractTarGz(p.fileIO, p.Filename, workDir)
 	if err != nil {
 		return fmt.Errorf("failed to extract package %s to %s: %w", p.Filename, workDir, err)
@@ -158,12 +106,6 @@ func (p *Package) Extract(force bool) error {
 		}
 	}
 
-	packageChecksum := p.getPackageChecksum()
-	err = p.saveExtractedChecksum(workDir, packageChecksum)
-	if err != nil {
-		log.Printf("Warning: failed to save checksum marker: %v", err)
-	}
-
 	return nil
 }
 

internal/installer/package_test.go

@@ -153,103 +153,6 @@ var _ = Describe("Package", func() {
 					Expect(err.Error()).To(ContainSubstring("failed to ensure workdir exists"))
 				})
 			})
-
-			Context("when package checksum changes", func() {
-				var checksumFile string
-
-				BeforeEach(func() {
-					checksumFile = pkg.Filename + ".md5"
-					err := os.WriteFile(checksumFile, []byte("original-checksum-123"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-				})
-
-				It("re-extracts when checksum changes", func() {
-					workDir := pkg.GetWorkDir()
-					markerFile := filepath.Join(workDir, ".oms-package-checksum")
-					Expect(markerFile).To(BeAnExistingFile())
-					content, err := os.ReadFile(markerFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(content)).To(Equal("original-checksum-123"))
-
-					testFile := filepath.Join(workDir, "test-file.txt")
-					err = os.WriteFile(testFile, []byte("modified content"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = os.WriteFile(checksumFile, []byte("new-checksum-456"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-
-					actualContent, err := os.ReadFile(testFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(actualContent)).To(Equal("test content"))
-
-					content, err = os.ReadFile(markerFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(content)).To(Equal("new-checksum-456"))
-				})
-
-				It("skips extraction when checksum is the same", func() {
-					workDir := pkg.GetWorkDir()
-					markerFile := filepath.Join(workDir, ".oms-package-checksum")
-					Expect(markerFile).To(BeAnExistingFile())
-
-					testFile := filepath.Join(workDir, "test-file.txt")
-					err := os.WriteFile(testFile, []byte("modified content"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-
-					actualContent, err := os.ReadFile(testFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(actualContent)).To(Equal("modified content"))
-				})
-
-				It("re-extracts when marker file is missing", func() {
-					workDir := pkg.GetWorkDir()
-					markerFile := filepath.Join(workDir, ".oms-package-checksum")
-
-					err := os.Remove(markerFile)
-					Expect(err).ToNot(HaveOccurred())
-
-					testFile := filepath.Join(workDir, "test-file.txt")
-					err = os.WriteFile(testFile, []byte("modified content"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-
-					actualContent, err := os.ReadFile(testFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(actualContent)).To(Equal("test content"))
-				})
-			})
-
-			Context("when no checksum sidecar file exists", func() {
-				BeforeEach(func() {
-					err := pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-				})
-
-				It("skips extraction without checksum (backward compatibility)", func() {
-					workDir := pkg.GetWorkDir()
-					testFile := filepath.Join(workDir, "test-file.txt")
-					err := os.WriteFile(testFile, []byte("modified content"), 0644)
-					Expect(err).ToNot(HaveOccurred())
-
-					err = pkg.Extract(false)
-					Expect(err).ToNot(HaveOccurred())
-
-					actualContent, err := os.ReadFile(testFile)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(string(actualContent)).To(Equal("modified content"))
-				})
-			})
 		})
 	})