Merge pull request #3377 from crazy-max/du-json

cmd: multiple formats output support for du command

tests/diskusage.go

@@ -0,0 +1,51 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+	"github.com/stretchr/testify/require"
+)
+
+var diskusageTests = []func(t *testing.T, sb integration.Sandbox){
+	testDiskusage,
+	testDiskusageVerbose,
+	testDiskusageVerboseFormatError,
+	testDiskusageFormatJSON,
+	testDiskusageFormatGoTemplate,
+}
+
+func testDiskusage(t *testing.T, sb integration.Sandbox) {
+	buildTestProject(t, sb)
+	cmd := buildxCmd(sb, withArgs("du"))
+	out, err := cmd.Output()
+	require.NoError(t, err, string(out))
+}
+
+func testDiskusageVerbose(t *testing.T, sb integration.Sandbox) {
+	buildTestProject(t, sb)
+	cmd := buildxCmd(sb, withArgs("du", "--verbose"))
+	out, err := cmd.Output()
+	require.NoError(t, err, string(out))
+}
+
+func testDiskusageVerboseFormatError(t *testing.T, sb integration.Sandbox) {
+	buildTestProject(t, sb)
+	cmd := buildxCmd(sb, withArgs("du", "--verbose", "--format=json"))
+	out, err := cmd.Output()
+	require.Error(t, err, string(out))
+}
+
+func testDiskusageFormatJSON(t *testing.T, sb integration.Sandbox) {
+	buildTestProject(t, sb)
+	cmd := buildxCmd(sb, withArgs("du", "--format=json"))
+	out, err := cmd.Output()
+	require.NoError(t, err, string(out))
+}
+
+func testDiskusageFormatGoTemplate(t *testing.T, sb integration.Sandbox) {
+	buildTestProject(t, sb)
+	cmd := buildxCmd(sb, withArgs("du", "--format={{.ID}}: {{.Size}}"))
+	out, err := cmd.Output()
+	require.NoError(t, err, string(out))
+}

tests/integration_test.go

@@ -33,6 +33,7 @@ func TestIntegration(t *testing.T) {
 	tests = append(tests, rmTests...)
 	tests = append(tests, dialstdioTests...)
 	tests = append(tests, composeTests...)
+	tests = append(tests, diskusageTests...)
 	testIntegration(t, tests...)
 }