Skip to content

Commit dc7d4c7

Browse files
committed
Fixed dropper
1 parent 584f69c commit dc7d4c7

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

pkg/drop/drop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TheBase(ctx context.Context, assets afero.Fs) {
2727
DeleteUsingCWD()
2828
DeleteUsingProc()
2929

30-
if err := afero.Walk(assets, "/scripts", func(path string, fi os.FileInfo, err error) error {
30+
if err := afero.Walk(assets, "", func(path string, fi os.FileInfo, err error) error {
3131
// Check for stat error
3232
if err != nil {
3333
fmt.Printf("[ERROR] failed to stat file %q: %s\n", path, err.Error())

pkg/script/stdlib/assets/assets_test.go

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package assets_test
22

33
import (
4+
"io/fs"
45
"io/ioutil"
56
"testing"
67

@@ -25,20 +26,20 @@ func writeFileForTest(fs afero.Fs, filename string, content string) error {
2526
}
2627

2728
func TestTarGZBundleConsistent(t *testing.T) {
28-
fs := afero.NewMemMapFs()
29+
afs := afero.NewMemMapFs()
2930
file1Name, file1Content := "file1", "boop"
3031
file2Name, file2Content := "file2", "shmoop"
3132

32-
err := writeFileForTest(fs, file1Name, file1Content)
33+
err := writeFileForTest(afs, file1Name, file1Content)
3334
require.NoError(t, err, "failed to create test file")
3435

35-
err = writeFileForTest(fs, file2Name, file2Content)
36+
err = writeFileForTest(afs, file2Name, file2Content)
3637
require.NoError(t, err, "failed to create test file")
3738

38-
f1, err := fs.Open(file1Name)
39+
f1, err := afs.Open(file1Name)
3940
require.NoError(t, err, "failed to open file")
4041

41-
f2, err := fs.Open(file2Name)
42+
f2, err := afs.Open(file2Name)
4243
require.NoError(t, err, "failed to open file")
4344

4445
targzbundlr := assets.TarGZBundler{}
@@ -71,4 +72,15 @@ func TestTarGZBundleConsistent(t *testing.T) {
7172

7273
require.Equal(t, file1Content, string(newf1Content), "invalid file content")
7374
require.Equal(t, file2Content, string(newf2Content), "invalid file content")
75+
76+
filenames := []string{}
77+
afero.Walk(newFS, "", func(path string, info fs.FileInfo, err error) error {
78+
require.NoError(t, err)
79+
if !info.IsDir() {
80+
filenames = append(filenames, path)
81+
}
82+
return nil
83+
})
84+
85+
require.Len(t, filenames, 2)
7486
}

0 commit comments

Comments
 (0)