Skip to content

fix(context): finish tar before closing export pipe #7341

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

Open
tayfuryldz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(context): finish tar before closing export pipe #7341

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions cli/context/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ func Export(name string, s Reader) io.ReadCloser {
reader, writer := io.Pipe()
go func() {
tw := tar.NewWriter(writer)
defer tw.Close()
defer writer.Close()
defer func() {
writer.CloseWithError(tw.Close())
}()
meta, err := s.GetMetadata(name)
if err != nil {
writer.CloseWithError(err)
Expand Down
24 changes: 24 additions & 0 deletions cli/context/store/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,30 @@ func TestExportImport(t *testing.T) {
assert.DeepEqual(t, file2, destData2)
}

func TestExportProducesCompleteTar(t *testing.T) {
s := New(t.TempDir(), testCfg)
err := s.CreateOrUpdate(Metadata{
Endpoints: map[string]any{"ep1": endpoint{Foo: "bar"}},
Metadata: context{Bar: "baz"},
Name: "source",
})
assert.NilError(t, err)
assert.NilError(t, s.ResetEndpointTLSMaterial("source", "ep1", &EndpointTLSData{
Files: map[string][]byte{"ca.pem": []byte("not-block-aligned")},
}))

r := Export("source", s)
data, err := io.ReadAll(r)
assert.NilError(t, err)
assert.NilError(t, r.Close())

assert.Equal(t, len(data)%tarBlockSize, 0)
assert.Assert(t, len(data) >= 2*tarBlockSize)
assert.DeepEqual(t, data[len(data)-2*tarBlockSize:], make([]byte, 2*tarBlockSize))
}

const tarBlockSize = 512

func TestRemove(t *testing.T) {
s := New(t.TempDir(), testCfg)
err := s.CreateOrUpdate(
Expand Down