diff --git a/cache/contenthash/checksum_test.go b/cache/contenthash/checksum_test.go index 0055298bad67..96e56f54091c 100644 --- a/cache/contenthash/checksum_test.go +++ b/cache/contenthash/checksum_test.go @@ -23,6 +23,7 @@ import ( "github.com/moby/buildkit/snapshot" containerdsnapshot "github.com/moby/buildkit/snapshot/containerd" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/winlayers" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" @@ -42,7 +43,7 @@ const ( func TestChecksumSymlinkNoParentScan(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -71,7 +72,7 @@ func TestChecksumSymlinkNoParentScan(t *testing.T) { func TestChecksumHardlinks(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -154,7 +155,7 @@ func TestChecksumHardlinks(t *testing.T) { func TestChecksumWildcardOrFilter(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -211,7 +212,7 @@ func TestChecksumWildcardOrFilter(t *testing.T) { func TestChecksumWildcardWithBadMountable(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -231,7 +232,7 @@ func TestChecksumWildcardWithBadMountable(t *testing.T) { func TestSymlinksNoFollow(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -290,7 +291,7 @@ func TestSymlinksNoFollow(t *testing.T) { func TestChecksumBasicFile(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -448,7 +449,7 @@ func TestChecksumIncludeExclude(t *testing.T) { func testChecksumIncludeExclude(t *testing.T, wildcard bool) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -583,7 +584,7 @@ func testChecksumIncludeExclude(t *testing.T, wildcard bool) { func TestChecksumIncludeDoubleStar(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -651,7 +652,7 @@ func TestChecksumIncludeDoubleStar(t *testing.T) { func TestChecksumIncludeSymlink(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -724,7 +725,7 @@ func TestChecksumIncludeSymlink(t *testing.T) { func TestHandleChange(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -802,7 +803,7 @@ func TestHandleChange(t *testing.T) { func TestHandleRecursiveDir(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -851,7 +852,7 @@ func TestHandleRecursiveDir(t *testing.T) { func TestChecksumUnorderedFiles(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -904,7 +905,7 @@ func TestChecksumUnorderedFiles(t *testing.T) { func TestSymlinkInPathScan(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -935,7 +936,7 @@ func TestSymlinkInPathScan(t *testing.T) { func TestSymlinkNeedsScan(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -968,7 +969,7 @@ func TestSymlinkNeedsScan(t *testing.T) { func TestSymlinkAbsDirSuffix(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -995,7 +996,7 @@ func TestSymlinkAbsDirSuffix(t *testing.T) { func TestSymlinkThroughParent(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1050,7 +1051,7 @@ func TestSymlinkThroughParent(t *testing.T) { func TestSymlinkInPathHandleChange(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1113,7 +1114,7 @@ func TestSymlinkInPathHandleChange(t *testing.T) { func TestPersistence(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/cache/manager_test.go b/cache/manager_test.go index 96442b94705e..47e6d27b4a2c 100644 --- a/cache/manager_test.go +++ b/cache/manager_test.go @@ -43,6 +43,7 @@ import ( "github.com/moby/buildkit/util/compression" "github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/winlayers" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" @@ -74,7 +75,7 @@ func newCacheManager(ctx context.Context, opt cmOpt) (co *cmOut, cleanup func() opt.snapshotterName = "native" } - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") if err != nil { return nil, nil, err } @@ -166,14 +167,14 @@ func TestSharableMountPoolCleanup(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) // Emulate the situation where the pool dir is dirty mountPoolDir := filepath.Join(tmpdir, "cachemounts") require.NoError(t, os.MkdirAll(mountPoolDir, 0700)) - _, err = os.MkdirTemp(mountPoolDir, "buildkit") + _, err = system.MkdirTemp(mountPoolDir, "buildkit") require.NoError(t, err) // Initialize cache manager and check if pool is cleaned up @@ -193,7 +194,7 @@ func TestManager(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -325,7 +326,7 @@ func TestLazyGetByBlob(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -370,7 +371,7 @@ func TestMergeBlobchainID(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -443,7 +444,7 @@ func TestSnapshotExtract(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -583,7 +584,7 @@ func TestExtractOnMutable(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -692,7 +693,7 @@ func TestSetBlob(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -865,7 +866,7 @@ func TestPrune(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -976,7 +977,7 @@ func TestLazyCommit(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1134,7 +1135,7 @@ func TestLoopLeaseContent(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1251,7 +1252,7 @@ func TestSharingCompressionVariant(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1519,7 +1520,7 @@ func TestConversion(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1616,7 +1617,7 @@ func TestGetRemotes(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1916,7 +1917,7 @@ func TestNondistributableBlobs(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -2047,7 +2048,7 @@ func TestMergeOp(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -2163,7 +2164,7 @@ func TestDiffOp(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -2267,7 +2268,7 @@ func TestLoadHalfFinalizedRef(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -2347,7 +2348,7 @@ func TestMountReadOnly(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -2595,7 +2596,7 @@ func fileToBlob(file *os.File, compress bool) ([]byte, ocispecs.Descriptor, erro } func mapToSystemTarBlob(m map[string]string) ([]byte, ocispecs.Descriptor, error) { - tmpdir, err := os.MkdirTemp("", "tarcreation") + tmpdir, err := system.MkdirTemp("", "tarcreation") if err != nil { return nil, ocispecs.Descriptor{}, err } diff --git a/cache/metadata/metadata_test.go b/cache/metadata/metadata_test.go index aa129cb2e2d2..a3306632379e 100644 --- a/cache/metadata/metadata_test.go +++ b/cache/metadata/metadata_test.go @@ -5,6 +5,7 @@ import ( "path/filepath" "testing" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/require" bolt "go.etcd.io/bbolt" ) @@ -12,7 +13,7 @@ import ( func TestGetSetSearch(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-storage") + tmpdir, err := system.MkdirTemp("", "buildkit-storage") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -111,7 +112,7 @@ func TestGetSetSearch(t *testing.T) { func TestIndexes(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-storage") + tmpdir, err := system.MkdirTemp("", "buildkit-storage") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -171,7 +172,7 @@ func TestIndexes(t *testing.T) { func TestExternalData(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "buildkit-storage") + tmpdir, err := system.MkdirTemp("", "buildkit-storage") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/cache/refs.go b/cache/refs.go index 013a2804d96a..78f5d7c44388 100644 --- a/cache/refs.go +++ b/cache/refs.go @@ -27,6 +27,7 @@ import ( "github.com/moby/buildkit/util/flightcontrol" "github.com/moby/buildkit/util/leaseutil" "github.com/moby/buildkit/util/progress" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/winlayers" "github.com/moby/sys/mountinfo" digest "github.com/opencontainers/go-digest" @@ -1630,7 +1631,7 @@ func (sm *sharableMountable) Mount() (_ []mount.Mount, _ func() error, retErr er // Don't need temporary mount wrapper for non-overlayfs mounts return mounts, release, nil } - dir, err := os.MkdirTemp(sm.mountPoolRoot, "buildkit") + dir, err := system.MkdirTemp(sm.mountPoolRoot, "buildkit") if err != nil { return nil, nil, err } diff --git a/client/build_test.go b/client/build_test.go index 95091bdb4936..6dc7f2c84afd 100644 --- a/client/build_test.go +++ b/client/build_test.go @@ -27,6 +27,7 @@ import ( "github.com/moby/buildkit/solver/pb" binfotypes "github.com/moby/buildkit/util/buildinfo/types" "github.com/moby/buildkit/util/entitlements" + "github.com/moby/buildkit/util/system" utilsystem "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/echoserver" "github.com/moby/buildkit/util/testutil/integration" @@ -133,7 +134,7 @@ func testClientGatewaySolve(t *testing.T, sb integration.Sandbox) { return r, nil } - tmpdir, err := os.MkdirTemp("", "buildkit") + tmpdir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -687,7 +688,7 @@ func testClientGatewayContainerMounts(t *testing.T, sb integration.Sandbox) { require.NoError(t, err) defer c.Close() - tmpdir, err := os.MkdirTemp("", "buildkit-buildctl") + tmpdir, err := system.MkdirTemp("", "buildkit-buildctl") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/client/client_test.go b/client/client_test.go index a7b45dcd4798..98736fd020ba 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -44,6 +44,7 @@ import ( binfotypes "github.com/moby/buildkit/util/buildinfo/types" "github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/entitlements" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil" "github.com/moby/buildkit/util/testutil/echoserver" "github.com/moby/buildkit/util/testutil/httpserver" @@ -199,7 +200,7 @@ func testCacheExportCacheKeyLoop(t *testing.T, sb integration.Sandbox) { require.NoError(t, err) defer c.Close() - tmpdir, err := os.MkdirTemp("", "buildkit-buildctl") + tmpdir, err := system.MkdirTemp("", "buildkit-buildctl") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -298,7 +299,7 @@ func testExportBusyboxLocal(t *testing.T, sb integration.Sandbox) { def, err := llb.Image("busybox").Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -440,7 +441,7 @@ func testSSHMount(t *testing.T, sb integration.Sandbox) { def, err = out.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -511,7 +512,7 @@ func testSSHMount(t *testing.T, sb integration.Sandbox) { }, ) - tmpDir, err := os.MkdirTemp("", "buildkit") + tmpDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(tmpDir) @@ -523,7 +524,7 @@ func testSSHMount(t *testing.T, sb integration.Sandbox) { }}) require.NoError(t, err) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -573,7 +574,7 @@ func testShmSize(t *testing.T, sb integration.Sandbox) { def, err := out.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -610,7 +611,7 @@ func testUlimit(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -655,7 +656,7 @@ func testCgroupParent(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -797,7 +798,7 @@ func testSecurityMode(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -990,7 +991,7 @@ func testFrontendImageNaming(t *testing.T, sb integration.Sandbox) { for _, exp := range []string{ExporterOCI, ExporterDocker, ExporterImage} { exp := exp // capture loop variable. t.Run(exp, func(t *testing.T) { - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1256,7 +1257,7 @@ func testRelativeWorkDir(t *testing.T, sb integration.Sandbox) { def, err := pwd.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1287,7 +1288,7 @@ func testFileOpMkdirMkfile(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1341,7 +1342,7 @@ func testFileOpCopyRm(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1412,7 +1413,7 @@ func testFileOpCopyIncludeExclude(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1461,7 +1462,7 @@ func testFileOpCopyIncludeExclude(t *testing.T, sb integration.Sandbox) { def, err = st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1544,7 +1545,7 @@ func testLocalSourceWithDiffer(t *testing.T, sb integration.Sandbox, d llb.DiffT def, err := st.Marshal(context.TODO()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1619,7 +1620,7 @@ func testFileOpRmWildcard(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1720,7 +1721,7 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) { require.Equal(t, server.Stats("/foo").AllRequests, 1) require.Equal(t, server.Stats("/foo").CachedRequests, 0) - tmpdir, err := os.MkdirTemp("", "buildkit") + tmpdir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -1793,7 +1794,7 @@ func testResolveAndHosts(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1847,7 +1848,7 @@ func testUser(t *testing.T, sb integration.Sandbox) { def, err := out.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1914,7 +1915,7 @@ func testOCIExporter(t *testing.T, sb integration.Sandbox) { require.NoError(t, err) for _, exp := range []string{ExporterOCI, ExporterDocker} { - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2084,7 +2085,7 @@ func testFrontendUseSolveResults(t *testing.T, sb integration.Sandbox) { }) } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2539,7 +2540,7 @@ func testBuildExportZstd(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2674,7 +2675,7 @@ func testPullZstdImage(t *testing.T, sb integration.Sandbox) { def, err = st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2740,7 +2741,7 @@ func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) { def, err = firstBuild.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2920,7 +2921,7 @@ func testStargzLazyRegistryCacheImportExport(t *testing.T, sb integration.Sandbo require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3160,7 +3161,7 @@ func testStargzLazyInlineCacheImportExport(t *testing.T, sb integration.Sandbox) checkAllReleasable(t, c, sb, true) // stargz layers should be exportable - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) out := filepath.Join(destDir, "out.tar") @@ -3292,7 +3293,7 @@ func testStargzLazyPull(t *testing.T, sb integration.Sandbox) { checkAllReleasable(t, c, sb, true) // stargz layers should be exportable - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) out := filepath.Join(destDir, "out.tar") @@ -3466,11 +3467,11 @@ func testZstdLocalCacheExport(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) - destOutDir, err := os.MkdirTemp("", "buildkit") + destOutDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destOutDir) @@ -3517,7 +3518,7 @@ func testZstdLocalCacheExport(t *testing.T, sb integration.Sandbox) { func testUncompressedLocalCacheImportExport(t *testing.T, sb integration.Sandbox) { integration.SkipIfDockerd(t, sb, "remote cache export") - dir, err := os.MkdirTemp("", "buildkit") + dir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(dir) im := CacheOptionsEntry{ @@ -3568,7 +3569,7 @@ func testZstdLocalCacheImportExport(t *testing.T, sb integration.Sandbox) { // containerd 1.4 doesn't support zstd compression return } - dir, err := os.MkdirTemp("", "buildkit") + dir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(dir) im := CacheOptionsEntry{ @@ -3638,7 +3639,7 @@ func testBasicCacheImportExport(t *testing.T, sb integration.Sandbox, cacheOptio def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3662,7 +3663,7 @@ func testBasicCacheImportExport(t *testing.T, sb integration.Sandbox, cacheOptio ensurePruneAll(t, c, sb) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3727,7 +3728,7 @@ func testMultipleRegistryCacheImportExport(t *testing.T, sb integration.Sandbox) func testBasicLocalCacheImportExport(t *testing.T, sb integration.Sandbox) { integration.SkipIfDockerd(t, sb, "remote cache export") - dir, err := os.MkdirTemp("", "buildkit") + dir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(dir) im := CacheOptionsEntry{ @@ -3910,7 +3911,7 @@ func readFileInImage(ctx context.Context, c *Client, ref, path string) ([]byte, if err != nil { return nil, err } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") if err != nil { return nil, err } @@ -3963,7 +3964,7 @@ func testCachedMounts(t *testing.T, sb integration.Sandbox) { st.AddMount("/src0", llb.Scratch(), llb.AsPersistentCacheDir("mycache1", llb.CacheMountShared)) st.AddMount("/src1", base, llb.AsPersistentCacheDir("mycache2", llb.CacheMountShared)) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4208,7 +4209,7 @@ func testDuplicateWhiteouts(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4280,7 +4281,7 @@ func testWhiteoutParentDir(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4346,7 +4347,7 @@ func testMoveParentDir(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4606,7 +4607,7 @@ func testRmSymlink(t *testing.T, sb integration.Sandbox) { def, err := mnt.File(llb.Rm("link")).Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4642,7 +4643,7 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) { def, err := out.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4670,7 +4671,7 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) { def, err = out.Marshal(sb.Context()) require.NoError(t, err) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4955,7 +4956,7 @@ func testMergeOpCache(t *testing.T, sb integration.Sandbox, mode string) { } // get the random value at /bar/2 - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5061,7 +5062,7 @@ func testMergeOpCache(t *testing.T, sb integration.Sandbox, mode string) { } // check the random value at /bar/2 didn't change - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5110,7 +5111,7 @@ func testMergeOpCache(t *testing.T, sb integration.Sandbox, mode string) { require.NoError(t, err) // check the random value at /bar/2 didn't change - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5171,7 +5172,7 @@ func requireContents(ctx context.Context, t *testing.T, c *Client, sb integratio def, err := state.Marshal(ctx) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5221,7 +5222,7 @@ func requireEqualContents(ctx context.Context, t *testing.T, c *Client, stateA, defA, err := stateA.Marshal(ctx) require.NoError(t, err) - destDirA, err := os.MkdirTemp("", "buildkit") + destDirA, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDirA) @@ -5238,7 +5239,7 @@ func requireEqualContents(ctx context.Context, t *testing.T, c *Client, stateA, defB, err := stateB.Marshal(ctx) require.NoError(t, err) - destDirB, err := os.MkdirTemp("", "buildkit") + destDirB, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDirB) @@ -5387,7 +5388,7 @@ func testInvalidExporter(t *testing.T, sb integration.Sandbox) { def, err := llb.Image("busybox:latest").Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5472,7 +5473,7 @@ func testParallelLocalBuilds(t *testing.T, sb integration.Sandbox) { def, err := llb.Local("source").Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5521,7 +5522,7 @@ func testRelativeMountpoint(t *testing.T, sb integration.Sandbox) { def, err := st.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5737,7 +5738,7 @@ func testCallInfo(t *testing.T, sb integration.Sandbox) { } func tmpdir(appliers ...fstest.Applier) (string, error) { - tmpdir, err := os.MkdirTemp("", "buildkit-client") + tmpdir, err := system.MkdirTemp("", "buildkit-client") if err != nil { return "", err } @@ -5748,7 +5749,7 @@ func tmpdir(appliers ...fstest.Applier) (string, error) { } func makeSSHAgentSock(agent agent.Agent) (p string, cleanup func() error, err error) { - tmpDir, err := os.MkdirTemp("", "buildkit") + tmpDir, err := system.MkdirTemp("", "buildkit") if err != nil { return "", nil, err } diff --git a/cmd/buildctl/build_test.go b/cmd/buildctl/build_test.go index 1ce1f88cb107..d17a9891b2ad 100644 --- a/cmd/buildctl/build_test.go +++ b/cmd/buildctl/build_test.go @@ -17,6 +17,7 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/moby/buildkit/client/llb" "github.com/moby/buildkit/exporter/containerimage/exptypes" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/require" @@ -54,7 +55,7 @@ func testBuildLocalExporter(t *testing.T, sb integration.Sandbox) { rdr, err := marshal(sb.Context(), out) require.NoError(t, err) - tmpdir, err := os.MkdirTemp("", "buildkit-buildctl") + tmpdir, err := system.MkdirTemp("", "buildkit-buildctl") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -120,7 +121,7 @@ func testBuildMetadataFile(t *testing.T, sb integration.Sandbox) { rdr, err := marshal(sb.Context(), st.Root()) require.NoError(t, err) - tmpDir, err := os.MkdirTemp("", "buildkit-buildctl") + tmpDir, err := system.MkdirTemp("", "buildkit-buildctl") require.NoError(t, err) defer os.RemoveAll(tmpDir) @@ -192,7 +193,7 @@ func marshal(ctx context.Context, st llb.State) (io.Reader, error) { } func tmpdir(appliers ...fstest.Applier) (string, error) { - tmpdir, err := os.MkdirTemp("", "buildkit-buildctl") + tmpdir, err := system.MkdirTemp("", "buildkit-buildctl") if err != nil { return "", err } diff --git a/cmd/buildctl/buildctl_test.go b/cmd/buildctl/buildctl_test.go index 44ac5622c67c..80c1c43e8f12 100644 --- a/cmd/buildctl/buildctl_test.go +++ b/cmd/buildctl/buildctl_test.go @@ -6,6 +6,7 @@ import ( "path" "testing" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/stretchr/testify/require" ) @@ -36,7 +37,7 @@ func testUsage(t *testing.T, sb integration.Sandbox) { } func TestWriteMetadataFile(t *testing.T) { - tmpdir, err := os.MkdirTemp("", "buildkit") + tmpdir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/executor/oci/resolvconf_test.go b/executor/oci/resolvconf_test.go index 578abb81328c..bb99d49aa12e 100644 --- a/executor/oci/resolvconf_test.go +++ b/executor/oci/resolvconf_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/docker/docker/libnetwork/resolvconf" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/require" ) @@ -26,7 +27,7 @@ nameserver 8.8.4.4 nameserver 2001:4860:4860::8888 nameserver 2001:4860:4860::8844` - dir, err := os.MkdirTemp("", "buildkit-test") + dir, err := system.MkdirTemp("", "buildkit-test") require.NoError(t, err) defer os.RemoveAll(dir) ctx := context.Background() diff --git a/exporter/local/export.go b/exporter/local/export.go index 7f2b0fe83f3d..c77c5ea346ab 100644 --- a/exporter/local/export.go +++ b/exporter/local/export.go @@ -13,6 +13,7 @@ import ( "github.com/moby/buildkit/session/filesync" "github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/util/progress" + "github.com/moby/buildkit/util/system" "github.com/tonistiigi/fsutil" fstypes "github.com/tonistiigi/fsutil/types" "golang.org/x/sync/errgroup" @@ -66,7 +67,7 @@ func (e *localExporterInstance) Export(ctx context.Context, inp exporter.Source, var err error var idmap *idtools.IdentityMapping if ref == nil { - src, err = os.MkdirTemp("", "buildkit") + src, err = system.MkdirTemp("", "buildkit") if err != nil { return err } diff --git a/exporter/tar/export.go b/exporter/tar/export.go index 846efa33046a..7503567d1d74 100644 --- a/exporter/tar/export.go +++ b/exporter/tar/export.go @@ -14,6 +14,7 @@ import ( "github.com/moby/buildkit/session/filesync" "github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/util/progress" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" "github.com/tonistiigi/fsutil" fstypes "github.com/tonistiigi/fsutil/types" @@ -82,7 +83,7 @@ func (e *localExporterInstance) Export(ctx context.Context, inp exporter.Source, var err error var idmap *idtools.IdentityMapping if ref == nil { - src, err = os.MkdirTemp("", "buildkit") + src, err = system.MkdirTemp("", "buildkit") if err != nil { return nil, err } diff --git a/frontend/dockerfile/dockerfile_buildinfo_test.go b/frontend/dockerfile/dockerfile_buildinfo_test.go index ae06ea094ae9..63ff9b0be681 100644 --- a/frontend/dockerfile/dockerfile_buildinfo_test.go +++ b/frontend/dockerfile/dockerfile_buildinfo_test.go @@ -20,6 +20,7 @@ import ( gateway "github.com/moby/buildkit/frontend/gateway/client" "github.com/moby/buildkit/solver/pb" binfotypes "github.com/moby/buildkit/util/buildinfo/types" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -47,7 +48,7 @@ func testBuildInfoSources(t *testing.T, sb integration.Sandbox) { f := getFrontend(t, sb) f.RequiresBuildctl(t) - gitDir, err := os.MkdirTemp("", "buildkit") + gitDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(gitDir) @@ -553,7 +554,7 @@ COPY --from=build /foo /out / return res, nil } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -699,7 +700,7 @@ COPY --from=build /foo /out / return res, nil } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -830,7 +831,7 @@ RUN echo "foo is $FOO" > /foo return res, nil } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) diff --git a/frontend/dockerfile/dockerfile_heredoc_test.go b/frontend/dockerfile/dockerfile_heredoc_test.go index 6671fe436406..c193e2477bbb 100644 --- a/frontend/dockerfile/dockerfile_heredoc_test.go +++ b/frontend/dockerfile/dockerfile_heredoc_test.go @@ -9,6 +9,7 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/moby/buildkit/client" "github.com/moby/buildkit/frontend/dockerfile/builder" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/pkg/errors" "github.com/stretchr/testify/require" @@ -77,7 +78,7 @@ COPY --from=build /dest / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -150,7 +151,7 @@ EOF require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -222,7 +223,7 @@ COPY --from=build /dest /dest require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -272,7 +273,7 @@ COPY --from=build /dest /dest require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -323,7 +324,7 @@ COPY --from=build /dest /dest require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -388,7 +389,7 @@ COPY --from=build /dest / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -480,7 +481,7 @@ COPY --from=build /dest / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -576,7 +577,7 @@ COPY --from=build /dest / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -682,7 +683,7 @@ EOF require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) diff --git a/frontend/dockerfile/dockerfile_mount_test.go b/frontend/dockerfile/dockerfile_mount_test.go index 05ab8d86ed06..a2b771e4a712 100644 --- a/frontend/dockerfile/dockerfile_mount_test.go +++ b/frontend/dockerfile/dockerfile_mount_test.go @@ -8,6 +8,7 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/moby/buildkit/client" "github.com/moby/buildkit/frontend/dockerfile/builder" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/stretchr/testify/require" ) @@ -184,7 +185,7 @@ COPY --from=second /unique /unique require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -213,7 +214,7 @@ COPY --from=second /unique /unique require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -467,7 +468,7 @@ COPY --from=base /tmpfssize / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) diff --git a/frontend/dockerfile/dockerfile_ssh_test.go b/frontend/dockerfile/dockerfile_ssh_test.go index 9728c496c2dc..3a80b6ee14f5 100644 --- a/frontend/dockerfile/dockerfile_ssh_test.go +++ b/frontend/dockerfile/dockerfile_ssh_test.go @@ -14,6 +14,7 @@ import ( "github.com/moby/buildkit/frontend/dockerfile/builder" "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/sshforward/sshprovider" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/stretchr/testify/require" ) @@ -54,7 +55,7 @@ RUN --mount=type=ssh,mode=741,uid=100,gid=102 [ "$(stat -c "%u %g %f" $SSH_AUTH_ }, ) - tmpDir, err := os.MkdirTemp("", "buildkit") + tmpDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(tmpDir) diff --git a/frontend/dockerfile/dockerfile_test.go b/frontend/dockerfile/dockerfile_test.go index 44616ee2dd5b..bcc661d9a980 100644 --- a/frontend/dockerfile/dockerfile_test.go +++ b/frontend/dockerfile/dockerfile_test.go @@ -36,6 +36,7 @@ import ( "github.com/moby/buildkit/solver/errdefs" "github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/util/contentutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil" "github.com/moby/buildkit/util/testutil/httpserver" "github.com/moby/buildkit/util/testutil/integration" @@ -227,7 +228,7 @@ echo -n $my_arg $1 > /out require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -282,7 +283,7 @@ RUN [ "$myenv" = 'foo%sbar' ] require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -415,7 +416,7 @@ COPY --from=base2 /foo /f require.NoError(t, err) defer os.RemoveAll(dir) - cacheDir, err := os.MkdirTemp("", "buildkit") + cacheDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(cacheDir) @@ -565,7 +566,7 @@ WORKDIR / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -771,7 +772,7 @@ COPY --from=base unique / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -795,7 +796,7 @@ COPY --from=base unique / err = os.WriteFile(filepath.Join(dir, "bar"), []byte("bar-data-mod"), 0600) require.NoError(t, err) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -820,7 +821,7 @@ COPY --from=base unique / err = os.WriteFile(filepath.Join(dir, "foo2"), []byte("foo2-data-mod"), 0600) require.NoError(t, err) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -862,7 +863,7 @@ COPY foo nomatch* / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1034,7 +1035,7 @@ COPY link/foo . require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1078,7 +1079,7 @@ COPY --from=build /sub2/foo bar require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1120,7 +1121,7 @@ COPY . / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1196,7 +1197,7 @@ COPY --from=build /out . require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1242,7 +1243,7 @@ COPY --from=build /out . require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1285,7 +1286,7 @@ COPY Dockerfile . require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1381,7 +1382,7 @@ COPY arch-$TARGETARCH whoami require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1416,7 +1417,7 @@ COPY arch-$TARGETARCH whoami // repeat with oci exporter - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1531,7 +1532,7 @@ COPY foo / require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1621,7 +1622,7 @@ COPY foo/sub bar require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1662,7 +1663,7 @@ COPY sub/l* alllinks/ require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1707,7 +1708,7 @@ FROM scratch COPY --from=0 /foo /foo `) - srcDir, err := os.MkdirTemp("", "buildkit") + srcDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(srcDir) @@ -1724,7 +1725,7 @@ COPY --from=0 /foo /foo }) defer server.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -1948,7 +1949,7 @@ COPY foo . def, err := echo.Marshal(sb.Context()) require.NoError(t, err) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2422,7 +2423,7 @@ ADD *.tar /dest require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2706,7 +2707,7 @@ Dockerfile require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -2968,7 +2969,7 @@ USER nobody require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3070,7 +3071,7 @@ COPY --from=base /out / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3135,7 +3136,7 @@ COPY --from=base /out / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3195,7 +3196,7 @@ COPY files dest require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3243,7 +3244,7 @@ COPY $FOO baz require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3298,7 +3299,7 @@ COPY sub/dir1 subdest6 require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3466,7 +3467,7 @@ COPY --from=build /dest /dest func testDockerfileFromGit(t *testing.T, sb integration.Sandbox) { f := getFrontend(t, sb) - gitDir, err := os.MkdirTemp("", "buildkit") + gitDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(gitDir) @@ -3507,7 +3508,7 @@ COPY --from=build foo bar2 server := httptest.NewServer(http.FileServer(http.Dir(filepath.Join(gitDir)))) defer server.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3537,7 +3538,7 @@ COPY --from=build foo bar2 require.True(t, errors.Is(err, os.ErrNotExist)) // second request from master branch contains both files - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3599,7 +3600,7 @@ COPY foo bar }) defer server.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3644,7 +3645,7 @@ COPY --from=busybox /etc/passwd test require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3682,7 +3683,7 @@ COPY --from=golang /usr/bin/go go require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3727,7 +3728,7 @@ COPY --from=stage1 baz bax require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3771,7 +3772,7 @@ LABEL foo=bar require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3848,7 +3849,7 @@ RUN ls /files/file1 require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -3958,7 +3959,7 @@ ONBUILD RUN mkdir -p /out && echo -n 11 >> /out/foo require.NoError(t, err) defer os.RemoveAll(dir) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4135,7 +4136,7 @@ COPY --from=base unique / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4170,7 +4171,7 @@ COPY --from=base unique / ensurePruneAll(t, c, sb) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4199,7 +4200,7 @@ COPY --from=base unique / require.NoError(t, err) require.Equal(t, string(dt), string(dt2)) - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) } @@ -4225,7 +4226,7 @@ RUN echo bar > bar require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4306,7 +4307,7 @@ RUN echo bar > bar require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4387,7 +4388,7 @@ COPY --from=s1 unique2 / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4408,7 +4409,7 @@ COPY --from=s1 unique2 / _, err = f.Solve(sb.Context(), c, opt, nil) require.NoError(t, err) - destDir2, err := os.MkdirTemp("", "buildkit") + destDir2, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4433,7 +4434,7 @@ COPY --from=s1 unique2 / require.NotEqual(t, string(unique1Dir1), string(unique1Dir2)) require.NotEqual(t, string(unique2Dir1), string(unique2Dir2)) - destDir3, err := os.MkdirTemp("", "buildkit") + destDir3, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4475,7 +4476,7 @@ COPY foo2 bar2 require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4526,7 +4527,7 @@ COPY --from=build out . require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4582,7 +4583,7 @@ COPY --from=build /out / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4612,7 +4613,7 @@ COPY --from=build /out / require.Equal(t, "hpvalue::npvalue::foocontents::::bazcontent", string(dt)) // repeat with changed default args should match the old cache - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4641,7 +4642,7 @@ COPY --from=build /out / require.Equal(t, "hpvalue::npvalue::foocontents::::bazcontent", string(dt)) // changing actual value invalidates cache - destDir, err = os.MkdirTemp("", "buildkit") + destDir, err = system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4756,7 +4757,7 @@ COPY foo bar url := up.Add(buf) // repeat with changed default args should match the old cache - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4832,7 +4833,7 @@ COPY foo foo2 }) } - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -4862,7 +4863,7 @@ func testFrontendInputs(t *testing.T, sb integration.Sandbox) { require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5075,7 +5076,7 @@ COPY --from=base /shmsize / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5120,7 +5121,7 @@ COPY --from=base /ulimit / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5169,7 +5170,7 @@ COPY --from=base /out / require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5217,7 +5218,7 @@ COPY --from=base /out / f := getFrontend(t, sb) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5275,7 +5276,7 @@ COPY --from=base /o* / f := getFrontend(t, sb) - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5389,7 +5390,7 @@ COPY --from=build /foo /out / product := "buildkit_test" - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5531,7 +5532,7 @@ COPY --from=build /foo /out / product := "buildkit_test" - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -5568,7 +5569,7 @@ COPY --from=build /foo /out / } func tmpdir(appliers ...fstest.Applier) (string, error) { - tmpdir, err := os.MkdirTemp("", "buildkit-dockerfile") + tmpdir, err := system.MkdirTemp("", "buildkit-dockerfile") if err != nil { return "", err } diff --git a/frontend/dockerfile/dockerignore/dockerignore_test.go b/frontend/dockerfile/dockerignore/dockerignore_test.go index 7327c268f234..151e99334ecd 100644 --- a/frontend/dockerfile/dockerignore/dockerignore_test.go +++ b/frontend/dockerfile/dockerignore/dockerignore_test.go @@ -5,10 +5,12 @@ import ( "os" "path/filepath" "testing" + + "github.com/moby/buildkit/util/system" ) func TestReadAll(t *testing.T) { - tmpDir, err := os.MkdirTemp("", "dockerignore-test") + tmpDir, err := system.MkdirTemp("", "dockerignore-test") if err != nil { t.Fatal(err) } diff --git a/frontend/frontend_test.go b/frontend/frontend_test.go index 8d8903019b85..9bb23a72933d 100644 --- a/frontend/frontend_test.go +++ b/frontend/frontend_test.go @@ -10,6 +10,7 @@ import ( "github.com/moby/buildkit/client" "github.com/moby/buildkit/client/llb" gateway "github.com/moby/buildkit/frontend/gateway/client" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -42,7 +43,7 @@ func testReturnNil(t *testing.T, sb integration.Sandbox) { require.NoError(t, err) defer c.Close() - destDir, err := os.MkdirTemp("", "buildkit") + destDir, err := system.MkdirTemp("", "buildkit") require.NoError(t, err) defer os.RemoveAll(destDir) @@ -296,7 +297,7 @@ func testRefStatFile(t *testing.T, sb integration.Sandbox) { } func tmpdir(appliers ...fstest.Applier) (string, error) { - tmpdir, err := os.MkdirTemp("", "buildkit-frontend") + tmpdir, err := system.MkdirTemp("", "buildkit-frontend") if err != nil { return "", err } diff --git a/frontend/gateway/gateway.go b/frontend/gateway/gateway.go index 8e9a00262d50..642c63d57ef5 100644 --- a/frontend/gateway/gateway.go +++ b/frontend/gateway/gateway.go @@ -42,6 +42,7 @@ import ( "github.com/moby/buildkit/util/buildinfo" "github.com/moby/buildkit/util/grpcerrors" "github.com/moby/buildkit/util/stack" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/tracing" "github.com/moby/buildkit/worker" "github.com/moby/sys/signal" @@ -300,7 +301,7 @@ func metadataMount(def *opspb.Definition) (*executor.Mount, func(), error) { if err != nil { return nil, nil, err } - dir, err := os.MkdirTemp("", "buildkit-metadata") + dir, err := system.MkdirTemp("", "buildkit-metadata") if err != nil { return nil, nil, err } diff --git a/session/content/content_test.go b/session/content/content_test.go index 549292b14202..3f0c2ff654f9 100644 --- a/session/content/content_test.go +++ b/session/content/content_test.go @@ -9,6 +9,7 @@ import ( "github.com/containerd/containerd/content/local" "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/testutil" + "github.com/moby/buildkit/util/system" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" @@ -23,7 +24,7 @@ func TestContentAttachable(t *testing.T) { attachableStores := make(map[string]content.Store) testBlobs := make(map[string]map[digest.Digest][]byte) for _, id := range ids { - tmpDir, err := os.MkdirTemp("", "contenttest") + tmpDir, err := system.MkdirTemp("", "contenttest") require.NoError(t, err) defer os.RemoveAll(tmpDir) store, err := local.NewStore(tmpDir) diff --git a/session/filesync/filesync_test.go b/session/filesync/filesync_test.go index b80cb7ccbff9..7195b0495107 100644 --- a/session/filesync/filesync_test.go +++ b/session/filesync/filesync_test.go @@ -8,6 +8,7 @@ import ( "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/testutil" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" @@ -16,10 +17,10 @@ import ( func TestFileSyncIncludePatterns(t *testing.T) { ctx := context.TODO() t.Parallel() - tmpDir, err := os.MkdirTemp("", "fsynctest") + tmpDir, err := system.MkdirTemp("", "fsynctest") require.NoError(t, err) - destDir, err := os.MkdirTemp("", "fsynctest") + destDir, err := system.MkdirTemp("", "fsynctest") require.NoError(t, err) err = os.WriteFile(filepath.Join(tmpDir, "foo"), []byte("content1"), 0600) diff --git a/session/sshforward/ssh.go b/session/sshforward/ssh.go index 42307d4f6ab9..29c1cd060498 100644 --- a/session/sshforward/ssh.go +++ b/session/sshforward/ssh.go @@ -6,6 +6,7 @@ import ( "path/filepath" "github.com/moby/buildkit/session" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" context "golang.org/x/net/context" "golang.org/x/sync/errgroup" @@ -63,7 +64,7 @@ type SocketOpt struct { } func MountSSHSocket(ctx context.Context, c session.Caller, opt SocketOpt) (sockPath string, closer func() error, err error) { - dir, err := os.MkdirTemp("", ".buildkit-ssh-sock") + dir, err := system.MkdirTemp("", ".buildkit-ssh-sock") if err != nil { return "", nil, errors.WithStack(err) } diff --git a/snapshot/localmounter_unix.go b/snapshot/localmounter_unix.go index 27cff3ebdf8c..b4b63d5baad2 100644 --- a/snapshot/localmounter_unix.go +++ b/snapshot/localmounter_unix.go @@ -8,6 +8,7 @@ import ( "syscall" "github.com/containerd/containerd/mount" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" ) @@ -37,7 +38,7 @@ func (lm *localMounter) Mount() (string, error) { } } - dir, err := os.MkdirTemp("", "buildkit-mount") + dir, err := system.MkdirTemp("", "buildkit-mount") if err != nil { return "", errors.Wrap(err, "failed to create temp dir") } diff --git a/snapshot/snapshotter_test.go b/snapshot/snapshotter_test.go index e625d8a3a62e..fc0eb4223a86 100644 --- a/snapshot/snapshotter_test.go +++ b/snapshot/snapshotter_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/moby/buildkit/identity" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/require" bolt "go.etcd.io/bbolt" ) @@ -47,7 +48,7 @@ func newSnapshotter(ctx context.Context, snapshotterName string) (_ context.Cont } }() - tmpdir, err := os.MkdirTemp("", "buildkit-test") + tmpdir, err := system.MkdirTemp("", "buildkit-test") if err != nil { return nil, nil, nil, err } diff --git a/solver/bboltcachestorage/storage_test.go b/solver/bboltcachestorage/storage_test.go index dd98a486c034..4fcb991ab869 100644 --- a/solver/bboltcachestorage/storage_test.go +++ b/solver/bboltcachestorage/storage_test.go @@ -7,12 +7,13 @@ import ( "github.com/moby/buildkit/solver" "github.com/moby/buildkit/solver/testutil" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/require" ) func TestBoltCacheStorage(t *testing.T) { testutil.RunCacheStorageTests(t, func() (solver.CacheKeyStorage, func()) { - tmpDir, err := os.MkdirTemp("", "storage") + tmpDir, err := system.MkdirTemp("", "storage") require.NoError(t, err) cleanup := func() { diff --git a/solver/jobs_test.go b/solver/jobs_test.go index 880c605ee160..361ee6c8de99 100644 --- a/solver/jobs_test.go +++ b/solver/jobs_test.go @@ -7,6 +7,7 @@ import ( "github.com/moby/buildkit/client" "github.com/moby/buildkit/client/llb" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" @@ -61,7 +62,7 @@ func testParallelism(t *testing.T, sb integration.Sandbox) { timeStart := time.Now() eg, egCtx := errgroup.WithContext(ctx) - tmpDir, err := os.MkdirTemp("", "solver-jobs-test-") + tmpDir, err := system.MkdirTemp("", "solver-jobs-test-") require.NoError(t, err) defer os.RemoveAll(tmpDir) solveOpt := client.SolveOpt{ diff --git a/solver/llbsolver/mounts/mount.go b/solver/llbsolver/mounts/mount.go index dd758aecdac8..3813641500f9 100644 --- a/solver/llbsolver/mounts/mount.go +++ b/solver/llbsolver/mounts/mount.go @@ -22,6 +22,7 @@ import ( "github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/util/grpcerrors" + "github.com/moby/buildkit/util/system" "github.com/moby/locker" "github.com/pkg/errors" "google.golang.org/grpc/codes" @@ -281,7 +282,7 @@ type secretMountInstance struct { } func (sm *secretMountInstance) Mount() ([]mount.Mount, func() error, error) { - dir, err := os.MkdirTemp("", "buildkit-secrets") + dir, err := system.MkdirTemp("", "buildkit-secrets") if err != nil { return nil, nil, errors.Wrap(err, "failed to create temp dir") } diff --git a/solver/llbsolver/mounts/mount_test.go b/solver/llbsolver/mounts/mount_test.go index ed3861356a95..8ce43741734d 100644 --- a/solver/llbsolver/mounts/mount_test.go +++ b/solver/llbsolver/mounts/mount_test.go @@ -23,6 +23,7 @@ import ( containerdsnapshot "github.com/moby/buildkit/snapshot/containerd" "github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/winlayers" "github.com/pkg/errors" "github.com/stretchr/testify/require" @@ -52,7 +53,7 @@ func newCacheManager(ctx context.Context, opt cmOpt) (co *cmOut, cleanup func() opt.snapshotterName = "native" } - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") if err != nil { return nil, nil, err } @@ -152,7 +153,7 @@ func TestCacheMountPrivateRefs(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -219,7 +220,7 @@ func TestCacheMountSharedRefs(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -269,7 +270,7 @@ func TestCacheMountLockedRefs(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -332,7 +333,7 @@ func TestCacheMountSharedRefsDeadlock(t *testing.T) { // not parallel ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "cachemanager") + tmpdir, err := system.MkdirTemp("", "cachemanager") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/solver/llbsolver/ops/exec_binfmt.go b/solver/llbsolver/ops/exec_binfmt.go index 829e84205950..7d484a2c26a6 100644 --- a/solver/llbsolver/ops/exec_binfmt.go +++ b/solver/llbsolver/ops/exec_binfmt.go @@ -14,6 +14,7 @@ import ( "github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/util/archutil" "github.com/moby/buildkit/util/bklog" + "github.com/moby/buildkit/util/system" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" copy "github.com/tonistiigi/fsutil/copy" @@ -46,7 +47,7 @@ type staticEmulatorMount struct { } func (m *staticEmulatorMount) Mount() ([]mount.Mount, func() error, error) { - tmpdir, err := os.MkdirTemp("", "buildkit-qemu-emulator") + tmpdir, err := system.MkdirTemp("", "buildkit-qemu-emulator") if err != nil { return nil, nil, err } diff --git a/source/git/gitsource.go b/source/git/gitsource.go index 5f11b04e94f8..3539412d472f 100644 --- a/source/git/gitsource.go +++ b/source/git/gitsource.go @@ -28,6 +28,7 @@ import ( srctypes "github.com/moby/buildkit/source/types" "github.com/moby/buildkit/util/bklog" "github.com/moby/buildkit/util/progress/logs" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/urlutil" "github.com/moby/locker" "github.com/pkg/errors" @@ -542,7 +543,7 @@ func (gs *gitSourceHandler) Snapshot(ctx context.Context, g session.Group) (out } else { cd := checkoutDir if subdir != "." { - cd, err = os.MkdirTemp(cd, "checkout") + cd, err = system.MkdirTemp(cd, "checkout") if err != nil { return nil, errors.Wrapf(err, "failed to create temporary checkout dir") } diff --git a/source/git/gitsource_test.go b/source/git/gitsource_test.go index 088137b42467..59b14cccbd0a 100644 --- a/source/git/gitsource_test.go +++ b/source/git/gitsource_test.go @@ -23,6 +23,7 @@ import ( containerdsnapshot "github.com/moby/buildkit/snapshot/containerd" "github.com/moby/buildkit/source" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/winlayers" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -51,13 +52,13 @@ func testRepeatedFetch(t *testing.T, keepGitDir bool) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) gs := setupGitSource(t, tmpdir) - repodir, err := os.MkdirTemp("", "buildkit-gitsource") + repodir, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir) @@ -170,13 +171,13 @@ func testFetchBySHA(t *testing.T, keepGitDir bool) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) gs := setupGitSource(t, tmpdir) - repodir, err := os.MkdirTemp("", "buildkit-gitsource") + repodir, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir) @@ -256,13 +257,13 @@ func testFetchByTag(t *testing.T, tag, expectedCommitSubject string, isAnnotated t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) gs := setupGitSource(t, tmpdir) - repodir, err := os.MkdirTemp("", "buildkit-gitsource") + repodir, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir) @@ -350,20 +351,20 @@ func testMultipleRepos(t *testing.T, keepGitDir bool) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) gs := setupGitSource(t, tmpdir) - repodir, err := os.MkdirTemp("", "buildkit-gitsource") + repodir, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir) repodir, err = setupGitRepo(repodir) require.NoError(t, err) - repodir2, err := os.MkdirTemp("", "buildkit-gitsource") + repodir2, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir2) @@ -447,7 +448,7 @@ func TestCredentialRedaction(t *testing.T) { t.Parallel() ctx := namespaces.WithNamespace(context.Background(), "buildkit-test") - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -479,13 +480,13 @@ func testSubdir(t *testing.T, keepGitDir bool) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) gs := setupGitSource(t, tmpdir) - repodir, err := os.MkdirTemp("", "buildkit-gitsource") + repodir, err := system.MkdirTemp("", "buildkit-gitsource") require.NoError(t, err) defer os.RemoveAll(repodir) diff --git a/source/http/httpsource_test.go b/source/http/httpsource_test.go index 5066d8cb3cff..cf6263b86624 100644 --- a/source/http/httpsource_test.go +++ b/source/http/httpsource_test.go @@ -20,6 +20,7 @@ import ( containerdsnapshot "github.com/moby/buildkit/snapshot/containerd" "github.com/moby/buildkit/source" "github.com/moby/buildkit/util/leaseutil" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/httpserver" "github.com/moby/buildkit/util/winlayers" digest "github.com/opencontainers/go-digest" @@ -35,7 +36,7 @@ func TestHTTPSource(t *testing.T) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -158,7 +159,7 @@ func TestHTTPDefaultName(t *testing.T) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -208,7 +209,7 @@ func TestHTTPInvalidURL(t *testing.T) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) @@ -236,7 +237,7 @@ func TestHTTPChecksum(t *testing.T) { t.Parallel() ctx := context.TODO() - tmpdir, err := os.MkdirTemp("", "buildkit-state") + tmpdir, err := system.MkdirTemp("", "buildkit-state") require.NoError(t, err) defer os.RemoveAll(tmpdir) diff --git a/util/archutil/check_unix.go b/util/archutil/check_unix.go index f6f90589fc1d..25b330a1a9fe 100644 --- a/util/archutil/check_unix.go +++ b/util/archutil/check_unix.go @@ -12,6 +12,7 @@ import ( "path/filepath" "syscall" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" ) @@ -22,7 +23,7 @@ func withChroot(cmd *exec.Cmd, dir string) { } func check(arch, bin string) (string, error) { - tmpdir, err := os.MkdirTemp("", "qemu-check") + tmpdir, err := system.MkdirTemp("", "qemu-check") if err != nil { return "", err } diff --git a/util/overlay/overlay_linux.go b/util/overlay/overlay_linux.go index 1e68150a3040..98df96e846ce 100644 --- a/util/overlay/overlay_linux.go +++ b/util/overlay/overlay_linux.go @@ -19,6 +19,7 @@ import ( "github.com/containerd/continuity/devices" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/sysx" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" "golang.org/x/sys/unix" ) @@ -113,7 +114,7 @@ func GetOverlayLayers(m mount.Mount) ([]string, error) { // WriteUpperdir writes a layer tar archive into the specified writer, based on // the diff information stored in the upperdir. func WriteUpperdir(ctx context.Context, w io.Writer, upperdir string, lower []mount.Mount) error { - emptyLower, err := os.MkdirTemp("", "buildkit") // empty directory used for the lower of diff view + emptyLower, err := system.MkdirTemp("", "buildkit") // empty directory used for the lower of diff view if err != nil { return errors.Wrapf(err, "failed to create temp dir") } diff --git a/util/overlay/overlay_linux_test.go b/util/overlay/overlay_linux_test.go index fe91261159c5..89110565065b 100644 --- a/util/overlay/overlay_linux_test.go +++ b/util/overlay/overlay_linux_test.go @@ -15,6 +15,7 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" ) @@ -336,7 +337,7 @@ func TestLchtimes(t *testing.T) { } func testDiffWithBase(base, diff fstest.Applier, expected []TestChange, opts ...string) error { - t1, err := os.MkdirTemp("", "diff-with-base-lower-") + t1, err := system.MkdirTemp("", "diff-with-base-lower-") if err != nil { return errors.Wrap(err, "failed to create temp dir") } @@ -346,13 +347,13 @@ func testDiffWithBase(base, diff fstest.Applier, expected []TestChange, opts ... return errors.Wrap(err, "failed to apply base filesystem") } - tupper, err := os.MkdirTemp("", "diff-with-base-upperdir-") + tupper, err := system.MkdirTemp("", "diff-with-base-upperdir-") if err != nil { return errors.Wrap(err, "failed to create temp dir") } defer os.RemoveAll(tupper) - workdir, err := os.MkdirTemp("", "diff-with-base-workdir-") + workdir, err := system.MkdirTemp("", "diff-with-base-workdir-") if err != nil { return errors.Wrap(err, "failed to create temp dir") } @@ -419,7 +420,7 @@ func collectAndCheckChanges(base, upperdir string, expected []TestChange) error ctx := context.Background() changes := []TestChange{} - emptyLower, err := os.MkdirTemp("", "buildkit-test-emptylower") // empty directory used for the lower of diff view + emptyLower, err := system.MkdirTemp("", "buildkit-test-emptylower") // empty directory used for the lower of diff view if err != nil { return errors.Wrapf(err, "failed to create temp dir") } diff --git a/util/system/tempdir.go b/util/system/tempdir.go new file mode 100644 index 000000000000..917b9ab61f69 --- /dev/null +++ b/util/system/tempdir.go @@ -0,0 +1,18 @@ +package system + +import ( + "os" +) + +const BuildkitTmpDirEnvVar = "BUILDKIT_TMPDIR" + +func MkdirTemp(dir string, pattern string) (string, error) { + if dir == "" { + tempDirRootPath := os.Getenv(BuildkitTmpDirEnvVar) + fileInfo, err := os.Stat(tempDirRootPath) + if err == nil && fileInfo.IsDir() { + dir = tempDirRootPath + } + } + return os.MkdirTemp(dir, pattern) +} diff --git a/util/testutil/integration/containerd.go b/util/testutil/integration/containerd.go index f8c7d24e8b24..94cebd1fb5e6 100644 --- a/util/testutil/integration/containerd.go +++ b/util/testutil/integration/containerd.go @@ -13,6 +13,7 @@ import ( "strings" "time" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -109,7 +110,7 @@ func (c *containerd) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl rootless = true } - tmpdir, err := os.MkdirTemp("", "bktest_containerd") + tmpdir, err := system.MkdirTemp("", "bktest_containerd") if err != nil { return nil, nil, err } diff --git a/util/testutil/integration/dockerd.go b/util/testutil/integration/dockerd.go index eeccbe44d132..1b7db4c876b8 100644 --- a/util/testutil/integration/dockerd.go +++ b/util/testutil/integration/dockerd.go @@ -14,6 +14,7 @@ import ( "github.com/docker/docker/client" "github.com/moby/buildkit/identity" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" @@ -53,7 +54,7 @@ func (c dockerd) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl fun var proxyGroup errgroup.Group deferF.append(proxyGroup.Wait) - workDir, err := os.MkdirTemp("", "integration") + workDir, err := system.MkdirTemp("", "integration") if err != nil { return nil, nil, err } diff --git a/util/testutil/integration/frombinary.go b/util/testutil/integration/frombinary.go index 4bf68193c548..e0f9347fdba7 100644 --- a/util/testutil/integration/frombinary.go +++ b/util/testutil/integration/frombinary.go @@ -8,13 +8,14 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/images/archive" + "github.com/moby/buildkit/util/system" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" ) func providerFromBinary(fn string) (_ ocispecs.Descriptor, _ content.Provider, _ func(), err error) { ctx := context.TODO() - tmpDir, err := os.MkdirTemp("", "buildkit-state") + tmpDir, err := system.MkdirTemp("", "buildkit-state") if err != nil { return ocispecs.Descriptor{}, nil, nil, err } diff --git a/util/testutil/integration/registry.go b/util/testutil/integration/registry.go index 5e380621d9f7..55b1348f84d0 100644 --- a/util/testutil/integration/registry.go +++ b/util/testutil/integration/registry.go @@ -11,6 +11,7 @@ import ( "regexp" "time" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" ) @@ -30,7 +31,7 @@ func NewRegistry(dir string) (url string, cl func() error, err error) { }() if dir == "" { - tmpdir, err := os.MkdirTemp("", "test-registry") + tmpdir, err := system.MkdirTemp("", "test-registry") if err != nil { return "", nil, err } diff --git a/util/testutil/integration/run.go b/util/testutil/integration/run.go index 23207ca5d054..164f21e061fa 100644 --- a/util/testutil/integration/run.go +++ b/util/testutil/integration/run.go @@ -21,6 +21,7 @@ import ( "github.com/gofrs/flock" "github.com/moby/buildkit/util/appcontext" "github.com/moby/buildkit/util/contentutil" + "github.com/moby/buildkit/util/system" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -294,7 +295,7 @@ mirrors=["%s"] } func writeConfig(updaters []ConfigUpdater) (string, error) { - tmpdir, err := os.MkdirTemp("", "bktest_config") + tmpdir, err := system.MkdirTemp("", "bktest_config") if err != nil { return "", err } @@ -427,7 +428,7 @@ func runStargzSnapshotter(cfg *BackendConfig) (address string, cl func() error, } }() - tmpStargzDir, err := os.MkdirTemp("", "bktest_containerd_stargz_grpc") + tmpStargzDir, err := system.MkdirTemp("", "bktest_containerd_stargz_grpc") if err != nil { return "", nil, err } diff --git a/util/testutil/integration/sandbox.go b/util/testutil/integration/sandbox.go index a72efddb8137..21ffd1e796b7 100644 --- a/util/testutil/integration/sandbox.go +++ b/util/testutil/integration/sandbox.go @@ -14,6 +14,7 @@ import ( "time" "github.com/google/shlex" + "github.com/moby/buildkit/util/system" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -167,7 +168,7 @@ func runBuildkitd(ctx context.Context, conf *BackendConfig, args []string, logs args = append(args, "--config="+conf.ConfigFile) } - tmpdir, err := os.MkdirTemp("", "bktest_buildkitd") + tmpdir, err := system.MkdirTemp("", "bktest_buildkitd") if err != nil { return "", nil, err } diff --git a/worker/base/worker_test.go b/worker/base/worker_test.go index a903c2b90314..80f8acc77997 100644 --- a/worker/base/worker_test.go +++ b/worker/base/worker_test.go @@ -4,12 +4,13 @@ import ( "os" "testing" + "github.com/moby/buildkit/util/system" "github.com/stretchr/testify/require" ) func TestID(t *testing.T) { t.Parallel() - tmpdir, err := os.MkdirTemp("", "worker-base-test-id") + tmpdir, err := system.MkdirTemp("", "worker-base-test-id") require.NoError(t, err) id0, err := ID(tmpdir) diff --git a/worker/containerd/containerd_test.go b/worker/containerd/containerd_test.go index bf2fc2561e86..a117488e00b2 100644 --- a/worker/containerd/containerd_test.go +++ b/worker/containerd/containerd_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/moby/buildkit/util/network/netproviders" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/testutil/integration" "github.com/moby/buildkit/worker/base" "github.com/moby/buildkit/worker/tests" @@ -28,7 +29,7 @@ func TestContainerdWorkerIntegration(t *testing.T) { } func newWorkerOpt(t *testing.T, addr string) (base.WorkerOpt, func()) { - tmpdir, err := os.MkdirTemp("", "workertest") + tmpdir, err := system.MkdirTemp("", "workertest") require.NoError(t, err) cleanup := func() { os.RemoveAll(tmpdir) } rootless := false diff --git a/worker/runc/runc_test.go b/worker/runc/runc_test.go index 0bb9c0334ac8..a6fa9ce7dea1 100644 --- a/worker/runc/runc_test.go +++ b/worker/runc/runc_test.go @@ -23,13 +23,14 @@ import ( "github.com/moby/buildkit/session" "github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/util/network/netproviders" + "github.com/moby/buildkit/util/system" "github.com/moby/buildkit/worker/base" "github.com/moby/buildkit/worker/tests" "github.com/stretchr/testify/require" ) func newWorkerOpt(t *testing.T, processMode oci.ProcessMode) (base.WorkerOpt, func()) { - tmpdir, err := os.MkdirTemp("", "workertest") + tmpdir, err := system.MkdirTemp("", "workertest") require.NoError(t, err) cleanup := func() { os.RemoveAll(tmpdir) }