Skip to content

Commit 35c4d6a

Browse files
author
Pranav Ravichandran
authored
fix: Fix cache removal (#27)
1 parent 024648a commit 35c4d6a

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

sdstore/sdstore.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ func (s *sdStore) Remove(u *url.URL) error {
8585
log.Printf("(Try %d of %d) error received from file removal: %v", i+1, maxRetries, err)
8686
continue
8787
}
88+
89+
log.Printf("Deletion from %s successful.", u.String())
90+
8891
return nil
8992
}
9093
return fmt.Errorf("removing from %s after %d retries: %v", u, maxRetries, err)

store-cli.go

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,37 @@ func set(storeType, scope, filePath string) error {
125125

126126
func remove(storeType, scope, key string) error {
127127
sdToken := os.Getenv("SD_TOKEN")
128+
store := sdstore.NewStore(sdToken)
129+
130+
if storeType == "cache" {
131+
md5URL, err := makeURL(storeType, scope, fmt.Sprintf("%s%s", filepath.Clean(key), "_md5.json"))
132+
if err != nil {
133+
return err
134+
}
135+
136+
err = store.Remove(md5URL)
137+
if err != nil {
138+
return fmt.Errorf("Failed to remove file from %s: %s", md5URL.String(), err)
139+
}
140+
141+
zipURL, err := makeURL(storeType, scope, fmt.Sprintf("%s%s", filepath.Clean(key), ".zip"))
142+
if err != nil {
143+
return err
144+
}
145+
146+
err = store.Remove(zipURL)
147+
if err != nil {
148+
return fmt.Errorf("Failed to remove file from %s: %s", zipURL.String(), err)
149+
}
150+
151+
return nil
152+
}
153+
128154
fullURL, err := makeURL(storeType, scope, key)
129155

130156
if err != nil {
131157
return err
132158
}
133-
store := sdstore.NewStore(sdToken)
134159
return store.Remove(fullURL)
135160
}
136161

0 commit comments

Comments
 (0)