Merge pull request docker#3568 from ndeloof/tabwriter

use our own version of text/tabwriter
rumpl · Apr 25, 2022 · 6c9eb70 · 6c9eb70
2 parents 0b78efe + fd2bc1f
commit 6c9eb70
Show file tree

Hide file tree

Showing 25 changed files with 4,306 additions and 5 deletions.
diff --git a/cli/command/container/top.go b/cli/command/container/top.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"text/tabwriter"
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter/tabwriter"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cli/command/context/create.go b/cli/command/context/create.go
@@ -3,10 +3,10 @@ package context
 import (
 	"bytes"
 	"fmt"
-	"text/tabwriter"
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter/tabwriter"
 	"github.com/docker/cli/cli/context/docker"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/pkg/errors"

diff --git a/cli/command/context/update.go b/cli/command/context/update.go
@@ -3,10 +3,10 @@ package context
 import (
 	"bytes"
 	"fmt"
-	"text/tabwriter"
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter/tabwriter"
 	"github.com/docker/cli/cli/context/docker"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/pkg/errors"

diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"io"
 	"strings"
-	"text/tabwriter"
 	"text/template"
 
+	"github.com/docker/cli/cli/command/formatter/tabwriter"
 	"github.com/docker/cli/templates"
 	"github.com/pkg/errors"
 )