Skip to content

Commit f66f13d

Browse files
danehlimdanehlim
committed
Move container/task statuses to ecs-agent module
1 parent 78703a3 commit f66f13d

File tree

118 files changed

+640
-154
lines changed

Some content is hidden

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

118 files changed

+640
-154
lines changed

‎agent/acs/session/payload_responder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818

1919
"github.com/aws/amazon-ecs-agent/agent/api"
2020
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
21-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2221
"github.com/aws/amazon-ecs-agent/agent/data"
2322
"github.com/aws/amazon-ecs-agent/agent/engine"
2423
"github.com/aws/amazon-ecs-agent/agent/eventhandler"
2524
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
25+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2626
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
2727
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2828
loggerfield "github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"

‎agent/acs/session/payload_responder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/aws/amazon-ecs-agent/agent/api"
2626
mock_api "github.com/aws/amazon-ecs-agent/agent/api/mocks"
2727
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
28-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2928
"github.com/aws/amazon-ecs-agent/agent/data"
3029
"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
3130
mock_engine "github.com/aws/amazon-ecs-agent/agent/engine/mocks"
@@ -37,6 +36,7 @@ import (
3736
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/session/testconst"
3837
"github.com/aws/amazon-ecs-agent/ecs-agent/api/eni"
3938
apiresource "github.com/aws/amazon-ecs-agent/ecs-agent/api/resource"
39+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4040
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
4141
"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
4242
"github.com/aws/aws-sdk-go/aws"

‎agent/acs/session/task_manifest_responder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ package session
1616
import (
1717
"strconv"
1818

19-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2019
"github.com/aws/amazon-ecs-agent/agent/data"
2120
"github.com/aws/amazon-ecs-agent/agent/engine"
2221
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
22+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2323
"github.com/aws/aws-sdk-go/aws"
2424
)
2525

‎agent/acs/session/task_manifest_responder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"testing"
2121

2222
"github.com/aws/amazon-ecs-agent/agent/api/task"
23-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2423
"github.com/aws/amazon-ecs-agent/agent/data"
2524
mock_engine "github.com/aws/amazon-ecs-agent/agent/engine/mocks"
2625
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
2726
acssession "github.com/aws/amazon-ecs-agent/ecs-agent/acs/session"
2827
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/session/testconst"
28+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2929
"github.com/aws/amazon-ecs-agent/ecs-agent/metrics"
3030
"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
3131
"github.com/aws/aws-sdk-go/aws"

‎agent/acs/session/task_stop_verification_ack_responder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
package session
1515

1616
import (
17-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
1817
"github.com/aws/amazon-ecs-agent/agent/engine"
18+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
1919
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2020
loggerfield "github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
2121
)

‎agent/acs/session/task_stop_verification_ack_responder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"testing"
2020

2121
"github.com/aws/amazon-ecs-agent/agent/api/task"
22-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2322
mock_engine "github.com/aws/amazon-ecs-agent/agent/engine/mocks"
2423
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
2524
acssession "github.com/aws/amazon-ecs-agent/ecs-agent/acs/session"
2625
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/session/testconst"
26+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2727
"github.com/aws/amazon-ecs-agent/ecs-agent/metrics"
2828
"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
2929
"github.com/aws/aws-sdk-go/aws"

‎agent/api/container/container.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"sync"
2323
"time"
2424

25-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2625
resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
26+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2727
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
2828
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
2929
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"

‎agent/api/container/container_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"testing"
2323
"time"
2424

25-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2625
resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
26+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2727

2828
"github.com/aws/amazon-ecs-agent/agent/utils"
2929
dockercontainer "github.com/docker/docker/api/types/container"

‎agent/api/container/transitiondependency.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ package container
1616
import (
1717
"encoding/json"
1818

19-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2019
resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
20+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2121

2222
"github.com/cihub/seelog"
2323
"github.com/pkg/errors"

‎agent/api/container/transitiondependency_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"encoding/json"
2121
"testing"
2222

23-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
23+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2424
"github.com/stretchr/testify/assert"
2525
)
2626

‎agent/api/ecsclient/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
"time"
2323

2424
"github.com/aws/amazon-ecs-agent/agent/api"
25-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2625
"github.com/aws/amazon-ecs-agent/agent/async"
2726
"github.com/aws/amazon-ecs-agent/agent/config"
2827
"github.com/aws/amazon-ecs-agent/agent/credentials/instancecreds"
2928
"github.com/aws/amazon-ecs-agent/agent/ec2"
3029
"github.com/aws/amazon-ecs-agent/agent/httpclient"
3130
"github.com/aws/amazon-ecs-agent/agent/utils"
31+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
3232
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
3333
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
3434
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"

‎agent/api/ecsclient/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ import (
3333

3434
"github.com/aws/amazon-ecs-agent/agent/api"
3535
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
36-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
3736
mock_api "github.com/aws/amazon-ecs-agent/agent/api/mocks"
38-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
3937
"github.com/aws/amazon-ecs-agent/agent/async"
4038
mock_async "github.com/aws/amazon-ecs-agent/agent/async/mocks"
4139
"github.com/aws/amazon-ecs-agent/agent/config"
4240
"github.com/aws/amazon-ecs-agent/agent/ec2"
4341
mock_ec2 "github.com/aws/amazon-ecs-agent/agent/ec2/mocks"
42+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
43+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4444
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
4545
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
4646
"github.com/aws/aws-sdk-go/aws"

‎agent/api/statechange.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"time"
2020

2121
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
22-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2322
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
24-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2523
"github.com/aws/amazon-ecs-agent/agent/statechange"
24+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
25+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2626
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2727
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
2828
"github.com/pkg/errors"

‎agent/api/statechange_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"time"
2323

2424
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
25-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2625
"github.com/aws/amazon-ecs-agent/agent/api/serviceconnect"
2726
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
28-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2927
execcmd "github.com/aws/amazon-ecs-agent/agent/engine/execcmd"
28+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
29+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
3030

3131
"github.com/stretchr/testify/assert"
3232
)

‎agent/api/task/task.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import (
2525
"time"
2626

2727
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
28-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2928
"github.com/aws/amazon-ecs-agent/agent/api/serviceconnect"
30-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
3129
"github.com/aws/amazon-ecs-agent/agent/config"
3230
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
3331
"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
@@ -43,7 +41,9 @@ import (
4341
taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
4442
"github.com/aws/amazon-ecs-agent/agent/utils"
4543
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
44+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
4645
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
46+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4747
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
4848
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
4949
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"

‎agent/api/task/task_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import (
2424
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2525
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
2626

27-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2827
"github.com/aws/amazon-ecs-agent/agent/config"
2928
"github.com/aws/amazon-ecs-agent/agent/ecscni"
3029
"github.com/aws/amazon-ecs-agent/agent/taskresource"
3130
"github.com/aws/amazon-ecs-agent/agent/taskresource/cgroup"
3231
resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
3332
resourcetype "github.com/aws/amazon-ecs-agent/agent/taskresource/types"
33+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
3434
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
3535
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
3636
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/arn"

‎agent/api/task/task_linux_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/aws/amazon-ecs-agent/agent/api/serviceconnect"
2626

2727
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
28-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2928
"github.com/aws/amazon-ecs-agent/agent/config"
3029
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
3130
"github.com/aws/amazon-ecs-agent/agent/ecscni"
@@ -35,6 +34,7 @@ import (
3534
"github.com/aws/amazon-ecs-agent/agent/taskresource/firelens"
3635
"github.com/aws/amazon-ecs-agent/agent/taskresource/ssmsecret"
3736
mock_ioutilwrapper "github.com/aws/amazon-ecs-agent/agent/utils/ioutilwrapper/mocks"
37+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
3838
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/appmesh"
3939
nlappmesh "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/appmesh"
4040
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"

‎agent/api/task/task_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import (
3232
"github.com/docker/go-connections/nat"
3333

3434
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
35-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
36-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
3735
"github.com/aws/amazon-ecs-agent/agent/asm"
3836
mock_asm_factory "github.com/aws/amazon-ecs-agent/agent/asm/factory/mocks"
3937
mock_factory "github.com/aws/amazon-ecs-agent/agent/asm/factory/mocks"
@@ -50,7 +48,9 @@ import (
5048
taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
5149
"github.com/aws/amazon-ecs-agent/agent/utils"
5250
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
51+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
5352
apiresource "github.com/aws/amazon-ecs-agent/ecs-agent/api/resource"
53+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
5454
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
5555
mock_credentials "github.com/aws/amazon-ecs-agent/ecs-agent/credentials/mocks"
5656
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"

‎agent/api/task/task_test_utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"time"
2121

2222
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
23-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2423
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
2524
"github.com/aws/amazon-ecs-agent/agent/taskresource"
2625
taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
2726
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
27+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2828
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/ttime"
2929

3030
"github.com/aws/aws-sdk-go/aws"

‎agent/api/task/task_windows_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import (
2323
"testing"
2424

2525
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
26-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
27-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2826
"github.com/aws/amazon-ecs-agent/agent/config"
2927
"github.com/aws/amazon-ecs-agent/agent/ecscni"
3028
"github.com/aws/amazon-ecs-agent/agent/taskresource"
3129
"github.com/aws/amazon-ecs-agent/agent/taskresource/fsxwindowsfileserver"
3230
taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
3331
"github.com/aws/amazon-ecs-agent/agent/utils"
3432
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
33+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
34+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
3535
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
3636
"github.com/golang/mock/gomock"
3737

‎agent/api/task/taskvolume_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"testing"
2424

2525
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
26-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2726
"github.com/aws/amazon-ecs-agent/agent/config"
2827
"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
2928
mock_dockerapi "github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi/mocks"
3029
"github.com/aws/amazon-ecs-agent/agent/taskresource"
3130
taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
31+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
3232
apiresource "github.com/aws/amazon-ecs-agent/ecs-agent/api/resource"
3333

3434
"github.com/docker/docker/api/types"

‎agent/api/testutils/container_equal_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222

2323
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
24-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
24+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2525
"github.com/aws/aws-sdk-go/aws"
2626
"github.com/stretchr/testify/assert"
2727
)

‎agent/api/testutils/task_equal_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
2424
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
25-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
25+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2626
"github.com/stretchr/testify/assert"
2727
)
2828

‎agent/data/container_client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package data
1818

1919
import (
2020
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
21-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
21+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2222

2323
"testing"
2424

‎agent/data/models/task_models.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
2323
"github.com/aws/amazon-ecs-agent/agent/api/serviceconnect"
2424
"github.com/aws/amazon-ecs-agent/agent/api/task"
25-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
2625
resourcetype "github.com/aws/amazon-ecs-agent/agent/taskresource/types"
26+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
2727
nlappmesh "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/appmesh"
2828
)
2929

‎agent/dockerclient/dockerapi/docker_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
3333

3434
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
35-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
3635
"github.com/aws/amazon-ecs-agent/agent/async"
3736
"github.com/aws/amazon-ecs-agent/agent/config"
3837
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
@@ -42,6 +41,7 @@ import (
4241
"github.com/aws/amazon-ecs-agent/agent/ecr"
4342
"github.com/aws/amazon-ecs-agent/agent/metrics"
4443
"github.com/aws/amazon-ecs-agent/agent/utils"
44+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
4545
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
4646
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry"
4747
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/ttime"

‎agent/dockerclient/dockerapi/docker_client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import (
3131
"time"
3232

3333
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
34-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
3534
"github.com/aws/amazon-ecs-agent/agent/config"
3635
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
3736
mock_sdkclient "github.com/aws/amazon-ecs-agent/agent/dockerclient/sdkclient/mocks"
3837
mock_sdkclientfactory "github.com/aws/amazon-ecs-agent/agent/dockerclient/sdkclientfactory/mocks"
3938
"github.com/aws/amazon-ecs-agent/agent/ec2"
4039
mock_ecr "github.com/aws/amazon-ecs-agent/agent/ecr/mocks"
4140
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
41+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
4242
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
4343
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
4444
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry"

‎agent/dockerclient/dockerapi/mocks/dockerapi_mocks.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎agent/dockerclient/dockerapi/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"time"
1919

2020
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
21-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
21+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
2222
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
2323
"github.com/aws/aws-sdk-go/aws"
2424
"github.com/docker/docker/api/types"

‎agent/engine/common_integ_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import (
2525

2626
"github.com/aws/amazon-ecs-agent/agent/api"
2727
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
28-
apicontainerstatus "github.com/aws/amazon-ecs-agent/agent/api/container/status"
2928
apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
30-
apitaskstatus "github.com/aws/amazon-ecs-agent/agent/api/task/status"
3129
"github.com/aws/amazon-ecs-agent/agent/config"
3230
"github.com/aws/amazon-ecs-agent/agent/containermetadata"
3331
"github.com/aws/amazon-ecs-agent/agent/data"
@@ -41,6 +39,8 @@ import (
4139
ssmfactory "github.com/aws/amazon-ecs-agent/agent/ssm/factory"
4240
"github.com/aws/amazon-ecs-agent/agent/statechange"
4341
"github.com/aws/amazon-ecs-agent/agent/taskresource"
42+
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
43+
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4444
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
4545
"github.com/aws/amazon-ecs-agent/ecs-agent/eventstream"
4646
log "github.com/cihub/seelog"

0 commit comments

Comments
 (0)