diff --git a/commands/diskusage.go b/commands/diskusage.go index 5bcc82231f7c..f4bb92ca7a12 100644 --- a/commands/diskusage.go +++ b/commands/diskusage.go @@ -120,7 +120,7 @@ func runDiskUsage(ctx context.Context, dockerCli command.Cli, opts duOptions) er if err != nil { return err } - du, err := c.DiskUsage(ctx, client.WithFilter(pi.Filter)) + du, err := c.DiskUsage(ctx, client.WithFilter(pi.Filter), client.WithAgeLimit(pi.KeepDuration)) if err != nil { return err } diff --git a/commands/diskusage_test.go b/commands/diskusage_test.go new file mode 100644 index 000000000000..cdf1828ccc73 --- /dev/null +++ b/commands/diskusage_test.go @@ -0,0 +1,48 @@ +package commands + +import ( + "testing" + "time" + + dclient "github.com/moby/moby/client" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestToBuildkitPruneInfoUntilFilter(t *testing.T) { + t.Run("until filter duration parsed", func(t *testing.T) { + f := dclient.Filters{} + f["until"] = map[string]bool{"168h": true} + pi, err := toBuildkitPruneInfo(f) + require.NoError(t, err) + assert.Equal(t, 168*time.Hour, pi.KeepDuration) + assert.Empty(t, pi.Filter[0]) + }) + + t.Run("unused-for filter duration parsed", func(t *testing.T) { + f := dclient.Filters{} + f["unused-for"] = map[string]bool{"24h": true} + pi, err := toBuildkitPruneInfo(f) + require.NoError(t, err) + assert.Equal(t, 24*time.Hour, pi.KeepDuration) + assert.Empty(t, pi.Filter[0]) + }) + + t.Run("conflicting until and unused-for", func(t *testing.T) { + f := dclient.Filters{} + f["until"] = map[string]bool{"24h": true} + f["unused-for"] = map[string]bool{"48h": true} + _, err := toBuildkitPruneInfo(f) + require.Error(t, err) + }) + + t.Run("combined until and type filter", func(t *testing.T) { + f := dclient.Filters{} + f["until"] = map[string]bool{"72h": true} + f["type"] = map[string]bool{"regular": true} + pi, err := toBuildkitPruneInfo(f) + require.NoError(t, err) + assert.Equal(t, 72*time.Hour, pi.KeepDuration) + assert.Equal(t, []string{"type==regular"}, pi.Filter) + }) +} diff --git a/tests/diskusage.go b/tests/diskusage.go index 8cfb4caa95ca..ccfad6d01906 100644 --- a/tests/diskusage.go +++ b/tests/diskusage.go @@ -9,6 +9,7 @@ import ( var diskusageTests = []func(t *testing.T, sb integration.Sandbox){ testDiskusage, + testDiskusageFilterUntil, testDiskusageVerbose, testDiskusageVerboseFormatError, testDiskusageFormatJSON, @@ -22,6 +23,23 @@ func testDiskusage(t *testing.T, sb integration.Sandbox) { require.NoError(t, err, string(out)) } +func testDiskusageFilterUntil(t *testing.T, sb integration.Sandbox) { + skipNoCompatBuildKit(t, sb, ">= 0.22.0-0", "disk usage age filter") + buildTestProject(t, sb) + cmd := buildxCmd(sb, withArgs("du", "--format={{.ID}}", "--filter=type=source.local")) + out, err := cmd.Output() + require.NoError(t, err, string(out)) + require.NotEmpty(t, out) + for _, filter := range []string{"until=24h", "unused-for=24h"} { + t.Run(filter, func(t *testing.T) { + cmd := buildxCmd(sb, withArgs("du", "--format={{.ID}}", "--filter=type=source.local", "--filter="+filter)) + out, err := cmd.Output() + require.NoError(t, err, string(out)) + require.Empty(t, out) + }) + } +} + func testDiskusageVerbose(t *testing.T, sb integration.Sandbox) { buildTestProject(t, sb) cmd := buildxCmd(sb, withArgs("du", "--verbose"))