Skip to content

pkg/asset/store: Use the asset directory in StoreImpl.Purge #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 24, 2018
Merged

pkg/asset/store: Use the asset directory in StoreImpl.Purge #527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/asset/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type assetState struct {

// StoreImpl is the implementation of Store.
type StoreImpl struct {
directory string
assets map[reflect.Type]assetState
stateFileAssets map[string]json.RawMessage
fileFetcher *fileFetcher
Expand All @@ -47,6 +48,7 @@ type StoreImpl struct {
// NewStore returns an asset store that implements the Store interface.
func NewStore(dir string) (Store, error) {
store := &StoreImpl{
directory: dir,
fileFetcher: &fileFetcher{directory: dir},
assets: make(map[reflect.Type]assetState),
}
Expand Down Expand Up @@ -234,7 +236,7 @@ func (s *StoreImpl) Purge(excluded []WritableAsset) error {
for _, asset := range toPurge {
logrus.Debugf("Purging asset %q", asset.Name())
for _, f := range asset.Files() {
if err := os.Remove(f.Filename); err != nil {
if err := os.Remove(filepath.Join(s.directory, f.Filename)); err != nil {
return errors.Wrapf(err, "failed to remove file %q", f.Filename)
}
}
Expand Down