Skip to content

Commit 659fba6

Browse files
jedevcjedevc
authored
Merge pull request moby#4093 from jedevc/tempdir-errors
2 parents dd0053c + f751a91 commit 659fba6

15 files changed

+206
-409
lines changed

‎client/client_test.go

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ func testLocalSymlinkEscape(t *testing.T, sb integration.Sandbox) {
14591459
[[ $(readlink /mount/sub/bar) == "../../../etc/group" ]]
14601460
`)
14611461

1462-
dir, err := integration.Tmpdir(
1462+
dir := integration.Tmpdir(
14631463
t,
14641464
// point to absolute path that is not part of dir
14651465
fstest.Symlink("/etc/passwd", "foo"),
@@ -1477,7 +1477,6 @@ func testLocalSymlinkEscape(t *testing.T, sb integration.Sandbox) {
14771477
fstest.CreateFile("baz", []byte{}, 0600),
14781478
fstest.CreateFile("test.sh", test, 0700),
14791479
)
1480-
require.NoError(t, err)
14811480

14821481
local := llb.Local("mylocal", llb.FollowPaths([]string{
14831482
"test.sh", "foo", "sub/bar", "bax", "sub/sub2/file",
@@ -1568,20 +1567,17 @@ func testFileOpCopyRm(t *testing.T, sb integration.Sandbox) {
15681567
require.NoError(t, err)
15691568
defer c.Close()
15701569

1571-
dir, err := integration.Tmpdir(
1570+
dir := integration.Tmpdir(
15721571
t,
15731572
fstest.CreateFile("myfile", []byte("data0"), 0600),
15741573
fstest.CreateDir("sub", 0700),
15751574
fstest.CreateFile("sub/foo", []byte("foo0"), 0600),
15761575
fstest.CreateFile("sub/bar", []byte("bar0"), 0600),
15771576
)
1578-
require.NoError(t, err)
1579-
1580-
dir2, err := integration.Tmpdir(
1577+
dir2 := integration.Tmpdir(
15811578
t,
15821579
fstest.CreateFile("file2", []byte("file2"), 0600),
15831580
)
1584-
require.NoError(t, err)
15851581

15861582
st := llb.Scratch().
15871583
File(
@@ -1694,14 +1690,13 @@ func testFileOpCopyIncludeExclude(t *testing.T, sb integration.Sandbox) {
16941690
require.NoError(t, err)
16951691
defer c.Close()
16961692

1697-
dir, err := integration.Tmpdir(
1693+
dir := integration.Tmpdir(
16981694
t,
16991695
fstest.CreateFile("myfile", []byte("data0"), 0600),
17001696
fstest.CreateDir("sub", 0700),
17011697
fstest.CreateFile("sub/foo", []byte("foo0"), 0600),
17021698
fstest.CreateFile("sub/bar", []byte("bar0"), 0600),
17031699
)
1704-
require.NoError(t, err)
17051700

17061701
st := llb.Scratch().File(
17071702
llb.Copy(
@@ -1833,11 +1828,10 @@ func testLocalSourceWithDiffer(t *testing.T, sb integration.Sandbox, d llb.DiffT
18331828
require.NoError(t, err)
18341829
defer c.Close()
18351830

1836-
dir, err := integration.Tmpdir(
1831+
dir := integration.Tmpdir(
18371832
t,
18381833
fstest.CreateFile("foo", []byte("foo"), 0600),
18391834
)
1840-
require.NoError(t, err)
18411835

18421836
tv := syscall.NsecToTimespec(time.Now().UnixNano())
18431837

@@ -2164,15 +2158,14 @@ func testFileOpRmWildcard(t *testing.T, sb integration.Sandbox) {
21642158
require.NoError(t, err)
21652159
defer c.Close()
21662160

2167-
dir, err := integration.Tmpdir(
2161+
dir := integration.Tmpdir(
21682162
t,
21692163
fstest.CreateDir("foo", 0700),
21702164
fstest.CreateDir("bar", 0700),
21712165
fstest.CreateFile("foo/target", []byte("foo0"), 0600),
21722166
fstest.CreateFile("bar/target", []byte("bar0"), 0600),
21732167
fstest.CreateFile("bar/remaining", []byte("bar1"), 0600),
21742168
)
2175-
require.NoError(t, err)
21762169

21772170
st := llb.Scratch().File(
21782171
llb.Copy(llb.Local("mylocal"), "foo", "foo").
@@ -7216,11 +7209,10 @@ func testParallelLocalBuilds(t *testing.T, sb integration.Sandbox) {
72167209
func(i int) {
72177210
eg.Go(func() error {
72187211
fn := fmt.Sprintf("test%d", i)
7219-
srcDir, err := integration.Tmpdir(
7212+
srcDir := integration.Tmpdir(
72207213
t,
72217214
fstest.CreateFile(fn, []byte("contents"), 0600),
72227215
)
7223-
require.NoError(t, err)
72247216

72257217
def, err := llb.Local("source").Marshal(sb.Context())
72267218
require.NoError(t, err)
@@ -9282,11 +9274,7 @@ func ensureFileContents(t *testing.T, path, expectedContents string) {
92829274
}
92839275

92849276
func makeSSHAgentSock(t *testing.T, agent agent.Agent) (p string, err error) {
9285-
tmpDir, err := integration.Tmpdir(t)
9286-
if err != nil {
9287-
return "", err
9288-
}
9289-
9277+
tmpDir := integration.Tmpdir(t)
92909278
sockPath := filepath.Join(tmpDir, "ssh_auth_sock")
92919279

92929280
l, err := net.Listen("unix", sockPath)

‎frontend/dockerfile/dockerfile_addchecksum_test.go

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ func testAddChecksum(t *testing.T, sb integration.Sandbox) {
4444
FROM scratch
4545
ADD --checksum=%s %s /tmp/foo
4646
`, digest.FromBytes(resp.Content).String(), server.URL+"/foo"))
47-
dir, err := integration.Tmpdir(
47+
dir := integration.Tmpdir(
4848
t,
4949
fstest.CreateFile("Dockerfile", dockerfile, 0600),
5050
)
51-
require.NoError(t, err)
52-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
51+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
5352
LocalDirs: map[string]string{
5453
dockerui.DefaultLocalNameDockerfile: dir,
5554
dockerui.DefaultLocalNameContext: dir,
@@ -64,12 +63,11 @@ ENV DIGEST=%s
6463
ENV LINK=%s
6564
ADD --checksum=${DIGEST} ${LINK} /tmp/foo
6665
`, digest.FromBytes(resp.Content).String(), server.URL+"/foo"))
67-
dir, err := integration.Tmpdir(
66+
dir := integration.Tmpdir(
6867
t,
6968
fstest.CreateFile("Dockerfile", dockerfile, 0600),
7069
)
71-
require.NoError(t, err)
72-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
70+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
7371
LocalDirs: map[string]string{
7472
dockerui.DefaultLocalNameDockerfile: dir,
7573
dockerui.DefaultLocalNameContext: dir,
@@ -82,12 +80,11 @@ ADD --checksum=${DIGEST} ${LINK} /tmp/foo
8280
FROM scratch
8381
ADD --checksum=%s %s /tmp/foo
8482
`, digest.FromBytes(nil).String(), server.URL+"/foo"))
85-
dir, err := integration.Tmpdir(
83+
dir := integration.Tmpdir(
8684
t,
8785
fstest.CreateFile("Dockerfile", dockerfile, 0600),
8886
)
89-
require.NoError(t, err)
90-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
87+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
9188
LocalDirs: map[string]string{
9289
dockerui.DefaultLocalNameDockerfile: dir,
9390
dockerui.DefaultLocalNameContext: dir,
@@ -100,12 +97,11 @@ ADD --checksum=%s %s /tmp/foo
10097
FROM scratch
10198
ADD --checksum=md5:7e55db001d319a94b0b713529a756623 %s /tmp/foo
10299
`, server.URL+"/foo"))
103-
dir, err := integration.Tmpdir(
100+
dir := integration.Tmpdir(
104101
t,
105102
fstest.CreateFile("Dockerfile", dockerfile, 0600),
106103
)
107-
require.NoError(t, err)
108-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
104+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
109105
LocalDirs: map[string]string{
110106
dockerui.DefaultLocalNameDockerfile: dir,
111107
dockerui.DefaultLocalNameContext: dir,
@@ -118,12 +114,11 @@ ADD --checksum=md5:7e55db001d319a94b0b713529a756623 %s /tmp/foo
118114
FROM scratch
119115
ADD --checksum=unknown:%s %s /tmp/foo
120116
`, digest.FromBytes(resp.Content).Encoded(), server.URL+"/foo"))
121-
dir, err := integration.Tmpdir(
117+
dir := integration.Tmpdir(
122118
t,
123119
fstest.CreateFile("Dockerfile", dockerfile, 0600),
124120
)
125-
require.NoError(t, err)
126-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
121+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
127122
LocalDirs: map[string]string{
128123
dockerui.DefaultLocalNameDockerfile: dir,
129124
dockerui.DefaultLocalNameContext: dir,
@@ -136,12 +131,11 @@ ADD --checksum=unknown:%s %s /tmp/foo
136131
FROM scratch
137132
ADD --checksum=%s %s /tmp/foo
138133
`, digest.FromBytes(resp.Content).Encoded(), server.URL+"/foo"))
139-
dir, err := integration.Tmpdir(
134+
dir := integration.Tmpdir(
140135
t,
141136
fstest.CreateFile("Dockerfile", dockerfile, 0600),
142137
)
143-
require.NoError(t, err)
144-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
138+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
145139
LocalDirs: map[string]string{
146140
dockerui.DefaultLocalNameDockerfile: dir,
147141
dockerui.DefaultLocalNameContext: dir,
@@ -155,13 +149,12 @@ ADD --checksum=%s %s /tmp/foo
155149
FROM scratch
156150
ADD --checksum=%s foo /tmp/foo
157151
`, digest.FromBytes(foo).String()))
158-
dir, err := integration.Tmpdir(
152+
dir := integration.Tmpdir(
159153
t,
160154
fstest.CreateFile("foo", foo, 0600),
161155
fstest.CreateFile("Dockerfile", dockerfile, 0600),
162156
)
163-
require.NoError(t, err)
164-
_, err = f.Solve(sb.Context(), c, client.SolveOpt{
157+
_, err := f.Solve(sb.Context(), c, client.SolveOpt{
165158
LocalDirs: map[string]string{
166159
dockerui.DefaultLocalNameDockerfile: dir,
167160
dockerui.DefaultLocalNameContext: dir,

‎frontend/dockerfile/dockerfile_addgit_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,9 @@ RUN cd /buildkit-chowned && \
8080
require.NoError(t, err)
8181
t.Logf("dockerfile=%s", dockerfile)
8282

83-
dir, err := integration.Tmpdir(t,
83+
dir := integration.Tmpdir(t,
8484
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
8585
)
86-
require.NoError(t, err)
87-
defer os.RemoveAll(dir)
8886

8987
c, err := client.New(sb.Context(), sb.Address())
9088
require.NoError(t, err)

‎frontend/dockerfile/dockerfile_heredoc_test.go

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ FROM scratch
6767
COPY --from=build /dest /
6868
`)
6969

70-
dir, err := integration.Tmpdir(
70+
dir := integration.Tmpdir(
7171
t,
7272
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
7373
)
74-
require.NoError(t, err)
7574

7675
c, err := client.New(sb.Context(), sb.Address())
7776
require.NoError(t, err)
@@ -138,11 +137,10 @@ COPY <<"EOF" rawslashfile3
138137
EOF
139138
`)
140139

141-
dir, err := integration.Tmpdir(
140+
dir := integration.Tmpdir(
142141
t,
143142
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
144143
)
145-
require.NoError(t, err)
146144

147145
c, err := client.New(sb.Context(), sb.Address())
148146
require.NoError(t, err)
@@ -208,11 +206,10 @@ FROM scratch
208206
COPY --from=build /dest /dest
209207
`)
210208

211-
dir, err := integration.Tmpdir(
209+
dir := integration.Tmpdir(
212210
t,
213211
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
214212
)
215-
require.NoError(t, err)
216213

217214
c, err := client.New(sb.Context(), sb.Address())
218215
require.NoError(t, err)
@@ -256,11 +253,10 @@ FROM scratch
256253
COPY --from=build /dest /dest
257254
`)
258255

259-
dir, err := integration.Tmpdir(
256+
dir := integration.Tmpdir(
260257
t,
261258
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
262259
)
263-
require.NoError(t, err)
264260

265261
c, err := client.New(sb.Context(), sb.Address())
266262
require.NoError(t, err)
@@ -305,11 +301,10 @@ FROM scratch
305301
COPY --from=build /dest /dest
306302
`)
307303

308-
dir, err := integration.Tmpdir(
304+
dir := integration.Tmpdir(
309305
t,
310306
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
311307
)
312-
require.NoError(t, err)
313308

314309
c, err := client.New(sb.Context(), sb.Address())
315310
require.NoError(t, err)
@@ -368,11 +363,10 @@ FROM scratch
368363
COPY --from=build /dest /
369364
`)
370365

371-
dir, err := integration.Tmpdir(
366+
dir := integration.Tmpdir(
372367
t,
373368
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
374369
)
375-
require.NoError(t, err)
376370

377371
c, err := client.New(sb.Context(), sb.Address())
378372
require.NoError(t, err)
@@ -458,11 +452,10 @@ FROM scratch
458452
COPY --from=build /dest /
459453
`)
460454

461-
dir, err := integration.Tmpdir(
455+
dir := integration.Tmpdir(
462456
t,
463457
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
464458
)
465-
require.NoError(t, err)
466459

467460
c, err := client.New(sb.Context(), sb.Address())
468461
require.NoError(t, err)
@@ -552,11 +545,10 @@ FROM scratch
552545
COPY --from=build /dest /
553546
`)
554547

555-
dir, err := integration.Tmpdir(
548+
dir := integration.Tmpdir(
556549
t,
557550
fstest.CreateFile("Dockerfile", []byte(dockerfile), 0600),
558551
)
559-
require.NoError(t, err)
560552

561553
c, err := client.New(sb.Context(), sb.Address())
562554
require.NoError(t, err)
@@ -616,11 +608,10 @@ echo "hello world" >> /dest
616608
EOF
617609
`)
618610

619-
dir, err := integration.Tmpdir(
611+
dir := integration.Tmpdir(
620612
t,
621613
fstest.CreateFile("Dockerfile", dockerfile, 0600),
622614
)
623-
require.NoError(t, err)
624615

625616
c, err := client.New(sb.Context(), sb.Address())
626617
require.NoError(t, err)
@@ -650,11 +641,10 @@ EOF
650641
COPY --from=base /dest /dest
651642
`, target))
652643

653-
dir, err = integration.Tmpdir(
644+
dir = integration.Tmpdir(
654645
t,
655646
fstest.CreateFile("Dockerfile", dockerfile, 0600),
656647
)
657-
require.NoError(t, err)
658648

659649
destDir := t.TempDir()
660650

0 commit comments

Comments
 (0)