Skip to content

Commit 71d60ec

Browse files
vdemeestervdemeester
committed
Move cli.Configdir away (in flags).
This makes integration not depend anymore of `cli` and thus not require `cobra` and other packages to compile. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent e925820 commit 71d60ec

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

‎cli/flags/common.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"path/filepath"
77

88
"github.com/Sirupsen/logrus"
9-
"github.com/docker/docker/cli"
109
"github.com/docker/docker/opts"
1110
"github.com/docker/go-connections/tlsconfig"
1211
"github.com/spf13/pflag"
@@ -46,7 +45,7 @@ func NewCommonOptions() *CommonOptions {
4645
// InstallFlags adds flags for the common options on the FlagSet
4746
func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) {
4847
if dockerCertPath == "" {
49-
dockerCertPath = cli.ConfigurationDir()
48+
dockerCertPath = ConfigurationDir()
5049
}
5150

5251
flags.BoolVarP(&commonOpts.Debug, "debug", "D", false, "Enable debug mode")

‎cli/flags/common_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"path/filepath"
55
"testing"
66

7-
"github.com/docker/docker/cli"
87
"github.com/spf13/pflag"
98
"github.com/stretchr/testify/assert"
109
)
@@ -26,7 +25,7 @@ func TestCommonOptionsInstallFlags(t *testing.T) {
2625
}
2726

2827
func defaultPath(filename string) string {
29-
return filepath.Join(cli.ConfigurationDir(), filename)
28+
return filepath.Join(ConfigurationDir(), filename)
3029
}
3130

3231
func TestCommonOptionsInstallFlagsWithDefaults(t *testing.T) {

cli/cli.go renamed to cli/flags/configdir.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cli
1+
package flags
22

33
import (
44
"os"

‎integration-cli/check_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313

1414
"github.com/docker/docker/api/types/swarm"
15-
dcli "github.com/docker/docker/cli"
15+
"github.com/docker/docker/cli/flags"
1616
"github.com/docker/docker/integration-cli/cli"
1717
"github.com/docker/docker/integration-cli/cli/build/fakestorage"
1818
"github.com/docker/docker/integration-cli/daemon"
@@ -406,7 +406,7 @@ func (s *DockerTrustSuite) TearDownTest(c *check.C) {
406406
}
407407

408408
// Remove trusted keys and metadata after test
409-
os.RemoveAll(filepath.Join(dcli.ConfigurationDir(), "trust"))
409+
os.RemoveAll(filepath.Join(flags.ConfigurationDir(), "trust"))
410410
s.ds.TearDownTest(c)
411411
}
412412

‎integration-cli/docker_cli_push_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"sync"
1313

1414
"github.com/docker/distribution/reference"
15-
dcli "github.com/docker/docker/cli"
15+
"github.com/docker/docker/cli/flags"
1616
"github.com/docker/docker/integration-cli/checker"
1717
"github.com/docker/docker/integration-cli/cli"
1818
"github.com/docker/docker/integration-cli/cli/build"
@@ -294,7 +294,7 @@ func (s *DockerTrustSuite) TestTrustedPush(c *check.C) {
294294
})
295295

296296
// Assert that we rotated the snapshot key to the server by checking our local keystore
297-
contents, err := ioutil.ReadDir(filepath.Join(dcli.ConfigurationDir(), "trust/private/tuf_keys", privateRegistryURL, "dockerclitrusted/pushtest"))
297+
contents, err := ioutil.ReadDir(filepath.Join(flags.ConfigurationDir(), "trust/private/tuf_keys", privateRegistryURL, "dockerclitrusted/pushtest"))
298298
c.Assert(err, check.IsNil, check.Commentf("Unable to read local tuf key files"))
299299
// Check that we only have 1 key (targets key)
300300
c.Assert(contents, checker.HasLen, 1)
@@ -399,7 +399,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithReleasesDelegationOnly(c *check.C)
399399
s.assertTargetNotInRoles(c, repoName, "latest", "targets")
400400

401401
// Try pull after push
402-
os.RemoveAll(filepath.Join(dcli.ConfigurationDir(), "trust"))
402+
os.RemoveAll(filepath.Join(flags.ConfigurationDir(), "trust"))
403403

404404
cli.Docker(cli.Args("pull", targetName), trustedCmd).Assert(c, icmd.Expected{
405405
Out: "Status: Image is up to date",
@@ -436,7 +436,7 @@ func (s *DockerTrustSuite) TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor(c
436436
s.assertTargetNotInRoles(c, repoName, "latest", "targets")
437437

438438
// Try pull after push
439-
os.RemoveAll(filepath.Join(dcli.ConfigurationDir(), "trust"))
439+
os.RemoveAll(filepath.Join(flags.ConfigurationDir(), "trust"))
440440

441441
// pull should fail because none of these are the releases role
442442
cli.Docker(cli.Args("pull", targetName), trustedCmd).Assert(c, icmd.Expected{
@@ -472,7 +472,7 @@ func (s *DockerTrustSuite) TestTrustedPushSignsForRolesWithKeysAndValidPaths(c *
472472
s.assertTargetNotInRoles(c, repoName, "latest", "targets")
473473

474474
// Try pull after push
475-
os.RemoveAll(filepath.Join(dcli.ConfigurationDir(), "trust"))
475+
os.RemoveAll(filepath.Join(flags.ConfigurationDir(), "trust"))
476476

477477
// pull should fail because none of these are the releases role
478478
cli.Docker(cli.Args("pull", targetName), trustedCmd).Assert(c, icmd.Expected{

‎integration-cli/trust_server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"time"
1313

14-
dcli "github.com/docker/docker/cli"
14+
"github.com/docker/docker/cli/flags"
1515
"github.com/docker/docker/integration-cli/checker"
1616
"github.com/docker/docker/integration-cli/cli"
1717
icmd "github.com/docker/docker/pkg/testutil/cmd"
@@ -108,7 +108,7 @@ func newTestNotary(c *check.C) (*testNotary, error) {
108108
"skipTLSVerify": true
109109
}
110110
}`
111-
if _, err = fmt.Fprintf(clientConfig, template, filepath.Join(dcli.ConfigurationDir(), "trust"), notaryURL); err != nil {
111+
if _, err = fmt.Fprintf(clientConfig, template, filepath.Join(flags.ConfigurationDir(), "trust"), notaryURL); err != nil {
112112
os.RemoveAll(tmp)
113113
return nil, err
114114
}

0 commit comments

Comments
 (0)