-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update will cleanup unneeded artifacts. (#752)
* Update will cleanup unneeded artifacts. The update process will cleanup unneeded artifacts. When an update starts all artifacts that do not have the current version number in it's name will be removed. If artifact retrieval fails, downloaded artifacts are removed. On a successful upgrade, all contents of the downloads dir will be removed. * Clean up linter warnings * Wrap errors * cleanup tests * Fix passed version * Use os.RemoveAll
- Loading branch information
1 parent
56f2216
commit 3e87782
Showing
4 changed files
with
101 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
// or more contributor license agreements. Licensed under the Elastic License; | ||
// you may not use this file except in compliance with the Elastic License. | ||
|
||
package upgrade | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
"path/filepath" | ||
"strings" | ||
|
||
"github.com/hashicorp/go-multierror" | ||
|
||
"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" | ||
) | ||
|
||
// preUpgradeCleanup will remove files that do not have the passed version number from the downloads directory. | ||
func preUpgradeCleanup(version string) error { | ||
files, err := os.ReadDir(paths.Downloads()) | ||
if err != nil { | ||
return fmt.Errorf("unable to read directory %q: %w", paths.Downloads(), err) | ||
} | ||
var rErr error | ||
for _, file := range files { | ||
if file.IsDir() { | ||
continue | ||
} | ||
if !strings.Contains(file.Name(), version) { | ||
if err := os.Remove(filepath.Join(paths.Downloads(), file.Name())); err != nil { | ||
rErr = multierror.Append(rErr, fmt.Errorf("unable to remove file %q: %w", filepath.Join(paths.Downloads(), file.Name()), err)) | ||
} | ||
} | ||
} | ||
return rErr | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
// or more contributor license agreements. Licensed under the Elastic License; | ||
// you may not use this file except in compliance with the Elastic License. | ||
|
||
package upgrade | ||
|
||
import ( | ||
"os" | ||
"path/filepath" | ||
"testing" | ||
|
||
"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func setupDir(t *testing.T) { | ||
t.Helper() | ||
dir := t.TempDir() | ||
paths.SetDownloads(dir) | ||
|
||
err := os.WriteFile(filepath.Join(dir, "test-8.3.0-file"), []byte("hello, world!"), 0600) | ||
require.NoError(t, err) | ||
err = os.WriteFile(filepath.Join(dir, "test-8.4.0-file"), []byte("hello, world!"), 0600) | ||
require.NoError(t, err) | ||
err = os.WriteFile(filepath.Join(dir, "test-8.5.0-file"), []byte("hello, world!"), 0600) | ||
require.NoError(t, err) | ||
err = os.WriteFile(filepath.Join(dir, "test-hash-file"), []byte("hello, world!"), 0600) | ||
require.NoError(t, err) | ||
} | ||
|
||
func TestPreUpgradeCleanup(t *testing.T) { | ||
setupDir(t) | ||
err := preUpgradeCleanup("8.4.0") | ||
require.NoError(t, err) | ||
|
||
files, err := os.ReadDir(paths.Downloads()) | ||
require.NoError(t, err) | ||
require.Len(t, files, 1) | ||
require.Equal(t, "test-8.4.0-file", files[0].Name()) | ||
p, err := os.ReadFile(filepath.Join(paths.Downloads(), files[0].Name())) | ||
require.NoError(t, err) | ||
require.Equal(t, []byte("hello, world!"), p) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters