Skip to content

Commit b6d7698

Browse files
ndeloofndeloof
committed
extract config into a dedicated module
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 3046019 commit b6d7698

File tree

88 files changed

+1284
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1284
-87
lines changed

‎cli-plugins/manager/cobra.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77

88
"github.com/docker/cli/cli-plugins/metadata"
9-
"github.com/docker/cli/cli/config"
9+
"github.com/docker/cli/config"
1010
"github.com/spf13/cobra"
1111
)
1212

‎cli-plugins/manager/hooks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77

88
"github.com/docker/cli/cli-plugins/hooks"
9-
"github.com/docker/cli/cli/config"
10-
"github.com/docker/cli/cli/config/configfile"
9+
"github.com/docker/cli/config"
10+
"github.com/docker/cli/config/configfile"
1111
"github.com/sirupsen/logrus"
1212
"github.com/spf13/cobra"
1313
"github.com/spf13/pflag"

‎cli-plugins/manager/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sync"
1111

1212
"github.com/docker/cli/cli-plugins/metadata"
13-
"github.com/docker/cli/cli/config"
14-
"github.com/docker/cli/cli/config/configfile"
13+
"github.com/docker/cli/config"
14+
"github.com/docker/cli/config/configfile"
1515
"github.com/fvbommel/sortorder"
1616
"github.com/spf13/cobra"
1717
"golang.org/x/sync/errgroup"

‎cli-plugins/manager/manager_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/docker/cli/cli/config"
9-
"github.com/docker/cli/cli/config/configfile"
8+
"github.com/docker/cli/config"
9+
"github.com/docker/cli/config/configfile"
1010
"github.com/docker/cli/internal/test"
1111
"github.com/spf13/cobra"
1212
"gotest.tools/v3/assert"

‎cli/command/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313
"sync"
1414
"time"
1515

16-
"github.com/docker/cli/cli/config"
17-
"github.com/docker/cli/cli/config/configfile"
1816
dcontext "github.com/docker/cli/cli/context"
1917
"github.com/docker/cli/cli/context/docker"
2018
"github.com/docker/cli/cli/context/store"
2119
"github.com/docker/cli/cli/debug"
2220
cliflags "github.com/docker/cli/cli/flags"
2321
"github.com/docker/cli/cli/streams"
2422
"github.com/docker/cli/cli/version"
23+
"github.com/docker/cli/config"
24+
"github.com/docker/cli/config/configfile"
2525
dopts "github.com/docker/cli/opts"
2626
"github.com/moby/moby/api/types/build"
2727
"github.com/moby/moby/api/types/swarm"

‎cli/command/cli_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"testing"
1717
"time"
1818

19-
"github.com/docker/cli/cli/config"
20-
"github.com/docker/cli/cli/config/configfile"
2119
"github.com/docker/cli/cli/flags"
20+
"github.com/docker/cli/config"
21+
"github.com/docker/cli/config/configfile"
2222
"github.com/moby/moby/api/types"
2323
"github.com/moby/moby/client"
2424
"gotest.tools/v3/assert"

‎cli/command/config/ls_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/docker/cli/cli/config/configfile"
10+
"github.com/docker/cli/config/configfile"
1111
"github.com/docker/cli/internal/test"
1212
"github.com/docker/cli/internal/test/builders"
1313
"github.com/moby/moby/api/types/swarm"

‎cli/command/container/auth_config_utils.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/docker/cli/cli/config"
9-
"github.com/docker/cli/cli/config/configfile"
10-
"github.com/docker/cli/cli/config/types"
8+
"github.com/docker/cli/config"
9+
"github.com/docker/cli/config/configfile"
10+
"github.com/docker/cli/config/types"
1111
)
1212

1313
// readCredentials resolves auth-config from the current environment to be

‎cli/command/container/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"github.com/docker/cli/cli/command"
1919
"github.com/docker/cli/cli/command/completion"
2020
"github.com/docker/cli/cli/command/image"
21-
"github.com/docker/cli/cli/config/configfile"
22-
"github.com/docker/cli/cli/config/types"
2321
"github.com/docker/cli/cli/streams"
2422
"github.com/docker/cli/cli/trust"
23+
"github.com/docker/cli/config/configfile"
24+
"github.com/docker/cli/config/types"
2525
"github.com/docker/cli/internal/jsonstream"
2626
"github.com/docker/cli/opts"
2727
"github.com/moby/moby/api/types/container"

‎cli/command/container/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/docker/cli/cli"
14-
"github.com/docker/cli/cli/config/configfile"
14+
"github.com/docker/cli/config/configfile"
1515
"github.com/docker/cli/internal/test"
1616
"github.com/docker/cli/internal/test/notary"
1717
"github.com/google/go-cmp/cmp"

0 commit comments

Comments
 (0)