Rename NewConfigFile to New in configfile package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 105b21d1ab
Component: cli

components/cli/cli/command/cli.go

@@ -36,6 +36,7 @@ type Cli interface {
 	In() *InStream
 	SetIn(in *InStream)
 	ConfigFile() *configfile.ConfigFile
+	ServerInfo() ServerInfo
 }
 
 // DockerCli is an instance the docker command line client.

components/cli/cli/command/image/build_session.go

@@ -26,11 +26,11 @@ import (
 
 const clientSessionRemote = "client-session"
 
-func isSessionSupported(dockerCli *command.DockerCli) bool {
+func isSessionSupported(dockerCli command.Cli) bool {
 	return dockerCli.ServerInfo().HasExperimental && versions.GreaterThanOrEqualTo(dockerCli.Client().ClientVersion(), "1.31")
 }
 
-func trySession(dockerCli *command.DockerCli, contextDir string) (*session.Session, error) {
+func trySession(dockerCli command.Cli, contextDir string) (*session.Session, error) {
 	var s *session.Session
 	if isSessionSupported(dockerCli) {
 		sharedKey, err := getBuildSharedKey(contextDir)

components/cli/cli/command/image/pull_test.go

@@ -43,7 +43,7 @@ func TestNewPullCommandErrors(t *testing.T) {
 	for _, tc := range testCases {
 		buf := new(bytes.Buffer)
 		cli := test.NewFakeCli(&fakeClient{}, buf)
-		cli.SetConfigfile(configfile.NewConfigFile("filename"))
+		cli.SetConfigfile(configfile.New("filename"))
 		cmd := NewPullCommand(cli)
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetArgs(tc.args)
@@ -68,7 +68,7 @@ func TestNewPullCommandSuccess(t *testing.T) {
 	for _, tc := range testCases {
 		buf := new(bytes.Buffer)
 		cli := test.NewFakeCli(&fakeClient{}, buf)
-		cli.SetConfigfile(configfile.NewConfigFile("filename"))
+		cli.SetConfigfile(configfile.New("filename"))
 		cmd := NewPullCommand(cli)
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetArgs(tc.args)

components/cli/cli/command/image/push_test.go

@@ -49,7 +49,7 @@ func TestNewPushCommandErrors(t *testing.T) {
 	for _, tc := range testCases {
 		buf := new(bytes.Buffer)
 		cli := test.NewFakeCli(&fakeClient{imagePushFunc: tc.imagePushFunc}, buf)
-		cli.SetConfigfile(configfile.NewConfigFile("filename"))
+		cli.SetConfigfile(configfile.New("filename"))
 		cmd := NewPushCommand(cli)
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetArgs(tc.args)
@@ -74,7 +74,7 @@ func TestNewPushCommandSuccess(t *testing.T) {
 				return ioutil.NopCloser(strings.NewReader("")), nil
 			},
 		}, buf)
-		cli.SetConfigfile(configfile.NewConfigFile("filename"))
+		cli.SetConfigfile(configfile.New("filename"))
 		cmd := NewPushCommand(cli)
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetArgs(tc.args)