Skip to content

Commit a31c7ad

Browse files
committed
Update ecs-agent/ ECS model with missing fields + consume the same
1 parent b2f0fc4 commit a31c7ad

File tree

72 files changed

+26688
-37158
lines changed

Some content is hidden

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

72 files changed

+26688
-37158
lines changed

agent/api/ecsclient/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"github.com/aws/amazon-ecs-agent/agent/utils"
2828
agentversion "github.com/aws/amazon-ecs-agent/agent/version"
2929
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
30+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
3031
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
3132
"github.com/aws/amazon-ecs-agent/ecs-agent/async"
3233
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials/instancecreds"
33-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
3434
"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
3535
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
3636
commonutils "github.com/aws/amazon-ecs-agent/ecs-agent/utils"

agent/api/ecsclient/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import (
3636
mock_ec2 "github.com/aws/amazon-ecs-agent/agent/ec2/mocks"
3737
"github.com/aws/amazon-ecs-agent/ecs-agent/api/attachment"
3838
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
39+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
3940
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4041
"github.com/aws/amazon-ecs-agent/ecs-agent/async"
4142
mock_async "github.com/aws/amazon-ecs-agent/ecs-agent/async/mocks"
42-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
4343
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
4444
"github.com/aws/aws-sdk-go/aws"
4545
"github.com/aws/aws-sdk-go/aws/awserr"

agent/api/ecsclient/retry_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"math/rand"
1919
"time"
2020

21-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
21+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
2222
"github.com/aws/aws-sdk-go/aws"
2323
"github.com/aws/aws-sdk-go/aws/client"
2424
"github.com/aws/aws-sdk-go/aws/request"

agent/api/ecsclient/retry_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
25+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
2626
"github.com/aws/aws-sdk-go/aws"
2727
"github.com/aws/aws-sdk-go/aws/defaults"
2828
)

agent/api/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package api
1515

1616
import (
17-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
17+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
1818
)
1919

2020
// ECSClient is an interface over the ECSSDK interface which abstracts away some

agent/api/mocks/api_mocks.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

agent/api/task/task.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import (
4242
"github.com/aws/amazon-ecs-agent/agent/utils"
4343
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
4444
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
45+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
4546
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
4647
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
4748
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
48-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
4949
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
5050
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
5151
nlappmesh "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/appmesh"

agent/api/task/task_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ import (
5050
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
5151
apiresource "github.com/aws/amazon-ecs-agent/ecs-agent/api/attachment/resource"
5252
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
53+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
5354
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
5455
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
5556
mock_credentials "github.com/aws/amazon-ecs-agent/ecs-agent/credentials/mocks"
56-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
5757
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
5858
commonutils "github.com/aws/amazon-ecs-agent/ecs-agent/utils"
5959
"github.com/aws/aws-sdk-go/service/secretsmanager"

agent/app/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ import (
5757
"github.com/aws/amazon-ecs-agent/agent/version"
5858
acsclient "github.com/aws/amazon-ecs-agent/ecs-agent/acs/client"
5959
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/session"
60+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
6061
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
6162
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
6263
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials/instancecreds"
6364
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
64-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
6565
"github.com/aws/amazon-ecs-agent/ecs-agent/eventstream"
6666
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
6767
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"

agent/app/agent_capability.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/aws/amazon-ecs-agent/agent/config"
2424
"github.com/aws/amazon-ecs-agent/agent/dockerclient"
2525
dm "github.com/aws/amazon-ecs-agent/agent/engine/daemonmanager"
26-
"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
26+
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
2727
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2828
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
2929
md "github.com/aws/amazon-ecs-agent/ecs-agent/manageddaemon"

0 commit comments

Comments
 (0)