diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eaf5fb603b..81c3e2161e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Changelog +## 1.28.1 +* Bug - Fixed a bug where docker volume deletion resulted in nullpointer [#2059](https://github.com/aws/amazon-ecs-agent/pull/2059) + ## 1.28.0 * Feature - Introduce high density awsvpc tasks support * Enhancement - Introduce `ECS_CGROUP_CPU_PERIOD` to make cgroup cpu period configurable [@boynux](https://github.com/boynux) [#1941](https://github.com/aws/amazon-ecs-agent/pull/1941) diff --git a/agent/dockerclient/dockerapi/docker_client.go b/agent/dockerclient/dockerapi/docker_client.go index bfa151c88e2..9dbb2366fcd 100644 --- a/agent/dockerclient/dockerapi/docker_client.go +++ b/agent/dockerclient/dockerapi/docker_client.go @@ -945,8 +945,8 @@ func (dg *dockerGoClient) handleContainerEvents(ctx context.Context, metadata := dg.containerMetadata(ctx, containerID) changedContainers <- DockerContainerChangeEvent{ - Status: status, - Type: eventType, + Status: status, + Type: eventType, DockerContainerMetadata: metadata, } } @@ -1209,8 +1209,8 @@ func (dg *dockerGoClient) removeVolume(ctx context.Context, name string) error { return &CannotGetDockerClientError{version: dg.version, err: err} } - ok := client.VolumeRemove(ctx, name, false) - if ok != nil { + err = client.VolumeRemove(ctx, name, false) + if err != nil { return &CannotRemoveVolumeError{err} } diff --git a/agent/dockerclient/dockerapi/docker_client_test.go b/agent/dockerclient/dockerapi/docker_client_test.go index 116cec1283c..080375bec86 100644 --- a/agent/dockerclient/dockerapi/docker_client_test.go +++ b/agent/dockerclient/dockerapi/docker_client_test.go @@ -1624,6 +1624,7 @@ func TestRemoveVolumeError(t *testing.T) { defer cancel() err := client.RemoveVolume(ctx, "name", dockerclient.RemoveVolumeTimeout) assert.Equal(t, "CannotRemoveVolumeError", err.(apierrors.NamedError).ErrorName()) + assert.NotNil(t, err.Error(), "Nested error cannot be nil") } func TestRemoveVolume(t *testing.T) {