Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused helath check func 

During the refactoring for 18.09 the activate/update flows no longer
restart the engine explicitly but let the user do that when they're ready,
so the health check logic is no longer required.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit f2b2061cc3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Daniel Hiltgen 2018-10-01 15:12:09 -07:00 committed by Sebastiaan van Stijn
parent 7808348548
commit a4aba23b85
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
6 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/command/engine/activate.go
View File

@ -127,12 +127,7 @@ func runActivate(cli command.Cli, options activateOptions) error {
EngineVersion: options.version, EngineVersion: options.version,
} }
if err := client.ActivateEngine(ctx, opts, cli.Out(), authConfig, if err := client.ActivateEngine(ctx, opts, cli.Out(), authConfig); err != nil {
func(ctx context.Context) error {
client := cli.Client()
_, err := client.Ping(ctx)
return err
}); err != nil {
return err return err
} }
fmt.Fprintln(cli.Out(), `Successfully activated engine. fmt.Fprintln(cli.Out(), `Successfully activated engine.

16
cli/command/engine/client_test.go
View File

@ -15,8 +15,7 @@ type (
activateEngineFunc func(ctx context.Context, activateEngineFunc func(ctx context.Context,
opts clitypes.EngineInitOptions, opts clitypes.EngineInitOptions,
out clitypes.OutStream, out clitypes.OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error
healthfn func(context.Context) error) error
initEngineFunc func(ctx context.Context, initEngineFunc func(ctx context.Context,
opts clitypes.EngineInitOptions, opts clitypes.EngineInitOptions,
out clitypes.OutStream, out clitypes.OutStream,
@ -25,8 +24,7 @@ type (
doUpdateFunc func(ctx context.Context, doUpdateFunc func(ctx context.Context,
opts clitypes.EngineInitOptions, opts clitypes.EngineInitOptions,
out clitypes.OutStream, out clitypes.OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error
healthfn func(context.Context) error) error
getEngineVersionsFunc func(ctx context.Context, getEngineVersionsFunc func(ctx context.Context,
registryClient registryclient.RegistryClient, registryClient registryclient.RegistryClient,
currentVersion, currentVersion,
@ -48,10 +46,9 @@ func (w *fakeContainerizedEngineClient) Close() error {
func (w *fakeContainerizedEngineClient) ActivateEngine(ctx context.Context, func (w *fakeContainerizedEngineClient) ActivateEngine(ctx context.Context,
opts clitypes.EngineInitOptions, opts clitypes.EngineInitOptions,
out clitypes.OutStream, out clitypes.OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error {
healthfn func(context.Context) error) error {
if w.activateEngineFunc != nil { if w.activateEngineFunc != nil {
return w.activateEngineFunc(ctx, opts, out, authConfig, healthfn) return w.activateEngineFunc(ctx, opts, out, authConfig)
} }
return nil return nil
} }
@ -68,10 +65,9 @@ func (w *fakeContainerizedEngineClient) InitEngine(ctx context.Context,
func (w *fakeContainerizedEngineClient) DoUpdate(ctx context.Context, func (w *fakeContainerizedEngineClient) DoUpdate(ctx context.Context,
opts clitypes.EngineInitOptions, opts clitypes.EngineInitOptions,
out clitypes.OutStream, out clitypes.OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error {
healthfn func(context.Context) error) error {
if w.doUpdateFunc != nil { if w.doUpdateFunc != nil {
return w.doUpdateFunc(ctx, opts, out, authConfig, healthfn) return w.doUpdateFunc(ctx, opts, out, authConfig)
} }
return nil return nil
} }

7
cli/command/engine/update.go
View File

@ -46,12 +46,7 @@ func runUpdate(dockerCli command.Cli, options extendedEngineInitOptions) error {
if err != nil { if err != nil {
return err return err
} }
if err := client.DoUpdate(ctx, options.EngineInitOptions, dockerCli.Out(), authConfig, if err := client.DoUpdate(ctx, options.EngineInitOptions, dockerCli.Out(), authConfig); err != nil {
func(ctx context.Context) error {
client := dockerCli.Client()
_, err := client.Ping(ctx)
return err
}); err != nil {
return err return err
} }
fmt.Fprintln(dockerCli.Out(), `Successfully updated engine. fmt.Fprintln(dockerCli.Out(), `Successfully updated engine.

6
internal/containerizedengine/update.go
View File

@ -22,7 +22,7 @@ import (
// ActivateEngine will switch the image from the CE to EE image // ActivateEngine will switch the image from the CE to EE image
func (c *baseClient) ActivateEngine(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream, func (c *baseClient) ActivateEngine(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream,
authConfig *types.AuthConfig, healthfn func(context.Context) error) error { authConfig *types.AuthConfig) error {
// If the user didn't specify an image, determine the correct enterprise image to use // If the user didn't specify an image, determine the correct enterprise image to use
if opts.EngineImage == "" { if opts.EngineImage == "" {
@ -44,12 +44,12 @@ func (c *baseClient) ActivateEngine(ctx context.Context, opts clitypes.EngineIni
} }
ctx = namespaces.WithNamespace(ctx, engineNamespace) ctx = namespaces.WithNamespace(ctx, engineNamespace)
return c.DoUpdate(ctx, opts, out, authConfig, healthfn) return c.DoUpdate(ctx, opts, out, authConfig)
} }
// DoUpdate performs the underlying engine update // DoUpdate performs the underlying engine update
func (c *baseClient) DoUpdate(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream, func (c *baseClient) DoUpdate(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream,
authConfig *types.AuthConfig, healthfn func(context.Context) error) error { authConfig *types.AuthConfig) error {
ctx = namespaces.WithNamespace(ctx, engineNamespace) ctx = namespaces.WithNamespace(ctx, engineNamespace)
if opts.EngineVersion == "" { if opts.EngineVersion == "" {

22
internal/containerizedengine/update_test.go
View File

@ -19,10 +19,6 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
) )
func healthfnHappy(ctx context.Context) error {
return nil
}
func TestActivateImagePermutations(t *testing.T) { func TestActivateImagePermutations(t *testing.T) {
ctx := context.Background() ctx := context.Background()
lookedup := "not called yet" lookedup := "not called yet"
@ -49,21 +45,21 @@ func TestActivateImagePermutations(t *testing.T) {
RuntimeMetadataDir: tmpdir, RuntimeMetadataDir: tmpdir,
} }
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, expectedError.Error()) assert.ErrorContains(t, err, expectedError.Error())
assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage, opts.EngineVersion)) assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage, opts.EngineVersion))
metadata = clitypes.RuntimeMetadata{EngineImage: clitypes.CommunityEngineImage} metadata = clitypes.RuntimeMetadata{EngineImage: clitypes.CommunityEngineImage}
err = versions.WriteRuntimeMetadata(tmpdir, &metadata) err = versions.WriteRuntimeMetadata(tmpdir, &metadata)
assert.NilError(t, err) assert.NilError(t, err)
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, expectedError.Error()) assert.ErrorContains(t, err, expectedError.Error())
assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage, opts.EngineVersion)) assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage, opts.EngineVersion))
metadata = clitypes.RuntimeMetadata{EngineImage: clitypes.CommunityEngineImage + "-dm"} metadata = clitypes.RuntimeMetadata{EngineImage: clitypes.CommunityEngineImage + "-dm"}
err = versions.WriteRuntimeMetadata(tmpdir, &metadata) err = versions.WriteRuntimeMetadata(tmpdir, &metadata)
assert.NilError(t, err) assert.NilError(t, err)
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, expectedError.Error()) assert.ErrorContains(t, err, expectedError.Error())
assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage+"-dm", opts.EngineVersion)) assert.Equal(t, lookedup, fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, clitypes.EnterpriseEngineImage+"-dm", opts.EngineVersion))
} }
@ -114,7 +110,7 @@ func TestActivateConfigFailure(t *testing.T) {
RuntimeMetadataDir: tmpdir, RuntimeMetadataDir: tmpdir,
} }
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "config lookup failure") assert.ErrorContains(t, err, "config lookup failure")
} }
@ -156,7 +152,7 @@ func TestActivateDoUpdateFail(t *testing.T) {
RuntimeMetadataDir: tmpdir, RuntimeMetadataDir: tmpdir,
} }
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "check for image") assert.ErrorContains(t, err, "check for image")
assert.ErrorContains(t, err, "something went wrong") assert.ErrorContains(t, err, "something went wrong")
} }
@ -178,7 +174,7 @@ func TestDoUpdateNoVersion(t *testing.T) {
} }
client := baseClient{} client := baseClient{}
err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "pick the version you") assert.ErrorContains(t, err, "pick the version you")
} }
@ -206,7 +202,7 @@ func TestDoUpdateImageMiscError(t *testing.T) {
}, },
} }
err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "check for image") assert.ErrorContains(t, err, "check for image")
assert.ErrorContains(t, err, "something went wrong") assert.ErrorContains(t, err, "something went wrong")
} }
@ -238,7 +234,7 @@ func TestDoUpdatePullFail(t *testing.T) {
}, },
} }
err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.DoUpdate(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "unable to pull") assert.ErrorContains(t, err, "unable to pull")
assert.ErrorContains(t, err, "pull failure") assert.ErrorContains(t, err, "pull failure")
} }
@ -284,7 +280,7 @@ func TestActivateDoUpdateVerifyImageName(t *testing.T) {
RuntimeMetadataDir: tmpdir, RuntimeMetadataDir: tmpdir,
} }
err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{}, healthfnHappy) err = client.ActivateEngine(ctx, opts, command.NewOutStream(&bytes.Buffer{}), &types.AuthConfig{})
assert.ErrorContains(t, err, "check for image") assert.ErrorContains(t, err, "check for image")
assert.ErrorContains(t, err, "something went wrong") assert.ErrorContains(t, err, "something went wrong")
expectedImage := fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, opts.EngineImage, opts.EngineVersion) expectedImage := fmt.Sprintf("%s/%s:%s", opts.RegistryPrefix, opts.EngineImage, opts.EngineVersion)

6
types/types.go
View File

@ -33,13 +33,11 @@ type ContainerizedClient interface {
ActivateEngine(ctx context.Context, ActivateEngine(ctx context.Context,
opts EngineInitOptions, opts EngineInitOptions,
out OutStream, out OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error
healthfn func(context.Context) error) error
DoUpdate(ctx context.Context, DoUpdate(ctx context.Context,
opts EngineInitOptions, opts EngineInitOptions,
out OutStream, out OutStream,
authConfig *types.AuthConfig, authConfig *types.AuthConfig) error
healthfn func(context.Context) error) error
} }
// EngineInitOptions contains the configuration settings // EngineInitOptions contains the configuration settings