fix after rebase

aws · Dec 10, 2024 · 7d2a689 · 7d2a689
1 parent ad1447c
commit 7d2a689
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 258 deletions.
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/ec2/ec2_client.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/ec2/ec2_client.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/ec2/mocks/ec2_mocks.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/ec2/mocks/ec2_mocks.go
diff --git a/ecs-agent/ec2/ec2_client.go b/ecs-agent/ec2/ec2_client.go
@@ -25,6 +25,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	ec2sdk "github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
 )
 
 const (
@@ -41,7 +42,7 @@ const (
 
 type Client interface {
 	CreateTags(input *ec2sdk.CreateTagsInput) (*ec2sdk.CreateTagsOutput, error)
-	DescribeECSTagsForInstance(instanceID string) ([]types.Tag, error)
+	DescribeECSTagsForInstance(instanceID string) ([]ecstypes.Tag, error)
 }
 
 type ClientSDK interface {
@@ -82,7 +83,7 @@ func (c *ClientImpl) SetClientSDK(sdk ClientSDK) {
 
 // DescribeECSTagsForInstance calls DescribeTags API to get the EC2 tags of the
 // instance id, and return it back as ECS tags
-func (c *ClientImpl) DescribeECSTagsForInstance(instanceID string) ([]types.Tag, error) {
+func (c *ClientImpl) DescribeECSTagsForInstance(instanceID string) ([]ecstypes.Tag, error) {
 	describeTagsInput := ec2sdk.DescribeTagsInput{
 		Filters: []types.Filter{
 			{
@@ -103,13 +104,13 @@ func (c *ClientImpl) DescribeECSTagsForInstance(instanceID string) ([]types.Tag,
 		return nil, err
 	}
 
-	var tags []types.Tag
+	var tags []ecstypes.Tag
 	// Convert ec2 tags to ecs tags
 	for _, ec2Tag := range res.Tags {
 		// Filter out all tags "aws:" prefix
 		if !strings.HasPrefix(strings.ToLower(aws.ToString(ec2Tag.Key)), awsTagPrefix) &&
 			!strings.HasPrefix(strings.ToLower(aws.ToString(ec2Tag.Value)), awsTagPrefix) {
-			tags = append(tags, types.Tag{
+			tags = append(tags, ecstypes.Tag{
 				Key:   ec2Tag.Key,
 				Value: ec2Tag.Value,
 			})

diff --git a/ecs-agent/ec2/mocks/ec2_mocks.go b/ecs-agent/ec2/mocks/ec2_mocks.go
diff --git a/ecs-agent/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go b/ecs-agent/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go
diff --git a/ecs-agent/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/unmarshal_error.go b/ecs-agent/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/unmarshal_error.go
diff --git a/ecs-agent/vendor/modules.txt b/ecs-agent/vendor/modules.txt
@@ -60,7 +60,6 @@ github.com/aws/aws-sdk-go/internal/sync/singleflight
 github.com/aws/aws-sdk-go/private/model/api
 github.com/aws/aws-sdk-go/private/protocol
 github.com/aws/aws-sdk-go/private/protocol/json/jsonutil
-github.com/aws/aws-sdk-go/private/protocol/jsonrpc
 github.com/aws/aws-sdk-go/private/protocol/rest
 github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil
 github.com/aws/aws-sdk-go/private/util