Merge pull request ActiveState#3667 from ActiveState/mitchell/dx-3213

mitchell-as · web-flow · commit 4527842f5b5e · 2025-03-17T16:20:28.000-04:00
When deleting cached depot artifacts, ensure ID is set.
diff --git a/pkg/runtime/depot.go b/pkg/runtime/depot.go
@@ -485,10 +485,12 @@ func (d *depot) removeStaleArtifacts() error {
 	var totalSize int64
 	unusedArtifacts := make([]*artifactInfo, 0)
 
-	for _, info := range d.config.Cache {
+	for id, info := range d.config.Cache {
 		if !info.InUse {
 			totalSize += info.Size
-			unusedArtifacts = append(unusedArtifacts, info)
+			unusedInfo := *info
+			unusedInfo.id = id // id is not set in cache since info is keyed by id
+			unusedArtifacts = append(unusedArtifacts, &unusedInfo)
 		}
 	}
 	logging.Debug("There are %d unused artifacts totaling %.1f MB in size", len(unusedArtifacts), float64(totalSize)/float64(MB))

Original file line number	Diff line number	Diff line change
`@@ -485,10 +485,12 @@ func (d *depot) removeStaleArtifacts() error {`
`485`	`485`	`var totalSize int64`
`486`	`486`	`unusedArtifacts := make([]*artifactInfo, 0)`
`487`	`487`
`488`		`- for _, info := range d.config.Cache {`
	`488`	`+ for id, info := range d.config.Cache {`
`489`	`489`	`if !info.InUse {`
`490`	`490`	`totalSize += info.Size`
`491`		`- unusedArtifacts = append(unusedArtifacts, info)`
	`491`	`+ unusedInfo := *info`
	`492`	`+ unusedInfo.id = id // id is not set in cache since info is keyed by id`
	`493`	`+ unusedArtifacts = append(unusedArtifacts, &unusedInfo)`
`492`	`494`	`}`
`493`	`495`	`}`
`494`	`496`	`logging.Debug("There are %d unused artifacts totaling %.1f MB in size", len(unusedArtifacts), float64(totalSize)/float64(MB))`