Skip to content

oci: preserve dir mode when extracting tar layers #1151

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
frazew wants to merge 1 commit into
base: main
Choose a base branch
from
Open

oci: preserve dir mode when extracting tar layers #1151

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
37 changes: 37 additions & 0 deletions oci/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,40 @@ func TestClient_Diff(t *testing.T) {
g.Expect(err).To(HaveOccurred())
g.Expect(err).To(MatchError("the remote artifact contents differs from the local one"))
}

func TestClient_PushPullDiff_RoundTrip(t *testing.T) {
g := NewWithT(t)
ctx := context.Background()
c := NewClient(DefaultOptions())
tag := "v0.0.1"
repo := "test-push" + randStringRunes(5)

url := fmt.Sprintf("%s/%s:%s", dockerReg, repo, tag)
metadata := Metadata{
Source: "github.com/fluxcd/flux2",
Revision: "rev",
}

testDir := "testdata/artifact"
_, err := c.Push(ctx, url, testDir, WithPushMetadata(metadata))
g.Expect(err).ToNot(HaveOccurred())

err = c.Diff(ctx, url, testDir, nil)
g.Expect(err).ToNot(HaveOccurred())

testDirStat, err := os.Stat(testDir)
g.Expect(err).ToNot(HaveOccurred())

tmpPullDir, err := os.MkdirTemp("", "oci")
g.Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpPullDir)

err = os.Chmod(tmpPullDir, testDirStat.Mode())
g.Expect(err).ToNot(HaveOccurred())

_, err = c.Pull(ctx, url, tmpPullDir)
g.Expect(err).ToNot(HaveOccurred())

err = c.Diff(ctx, url, tmpPullDir, nil)
g.Expect(err).ToNot(HaveOccurred())
}
2 changes: 1 addition & 1 deletion tar/tar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func Untar(r io.Reader, dir string, inOpts ...TarOption) (err error) {
}
}
case mode.IsDir():
if err := os.MkdirAll(abs, 0o750); err != nil {
if err := os.MkdirAll(abs, mode.Perm()); err != nil {
return err
}
madeDir[abs] = true
Expand Down