Skip to content

Continue migrating ecs-agent module to aws-sdk-go-v2 #4583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yiyuanzzz merged 1 commit into from
Apr 25, 2025
Merged

Continue migrating ecs-agent module to aws-sdk-go-v2 #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions ...dor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/types/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...b.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/taskprotection/v1/handlers/handlers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/utils/arn/arn.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/utils/utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ecs-agent/api/appnet/client_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/http/httptest"
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/gorilla/mux"
prometheus "github.com/prometheus/client_model/go"
"github.com/stretchr/testify/assert"
Expand Down
3 changes: 2 additions & 1 deletion ecs-agent/api/ecs/statechange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ import (
mock_statechange "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/mocks/statechange"
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/aws/aws-sdk-go/aws"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
Expand Down
38 changes: 19 additions & 19 deletions ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig"
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/execwrapper"

"github.com/aws/aws-sdk-go-v2/aws"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/aws/aws-sdk-go/aws"
"github.com/gorilla/mux"
)

Expand Down Expand Up @@ -127,8 +127,8 @@ func (h *FaultHandler) StartNetworkBlackholePort() func(http.ResponseWriter, *ht
return
}

if aws.StringValue(request.TrafficType) == types.TrafficTypeEgress &&
aws.Uint16Value(request.Port) == tmds.PortForTasks {
if aws.ToString(request.TrafficType) == types.TrafficTypeEgress &&
aws.ToUint16(request.Port) == tmds.PortForTasks {
// Add TMDS IP to SouresToFilter so that access to TMDS is not blocked for the task
request.AddSourceToFilterIfNotAlready(tmds.IPForTasks)
}
Expand All @@ -154,15 +154,15 @@ func (h *FaultHandler) StartNetworkBlackholePort() func(http.ResponseWriter, *ht
networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
taskArn := taskMetadata.TaskARN
stringToBeLogged := "Failed to start fault"
port := strconv.FormatUint(uint64(aws.Uint16Value(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.StringValue(request.TrafficType), aws.StringValue(request.Protocol), port)
port := strconv.FormatUint(uint64(aws.ToUint16(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.ToString(request.TrafficType), aws.ToString(request.Protocol), port)
insertTable := "INPUT"
if aws.StringValue(request.TrafficType) == "egress" {
if aws.ToString(request.TrafficType) == "egress" {
insertTable = "OUTPUT"
}

_, cmdErr := h.startNetworkBlackholePort(ctxWithTimeout, aws.StringValue(request.Protocol),
port, aws.StringValueSlice(request.SourcesToFilter), chainName,
_, cmdErr := h.startNetworkBlackholePort(ctxWithTimeout, aws.ToString(request.Protocol),
port, aws.ToStringSlice(request.SourcesToFilter), chainName,
networkMode, networkNSPath, insertTable, taskArn)
if err := ctxWithTimeout.Err(); errors.Is(err, context.DeadlineExceeded) {
statusCode = http.StatusInternalServerError
Expand Down Expand Up @@ -339,14 +339,14 @@ func (h *FaultHandler) StopNetworkBlackHolePort() func(http.ResponseWriter, *htt
networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
taskArn := taskMetadata.TaskARN
stringToBeLogged := "Failed to stop fault"
port := strconv.FormatUint(uint64(aws.Uint16Value(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.StringValue(request.TrafficType), aws.StringValue(request.Protocol), port)
port := strconv.FormatUint(uint64(aws.ToUint16(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.ToString(request.TrafficType), aws.ToString(request.Protocol), port)
insertTable := "INPUT"
if aws.StringValue(request.TrafficType) == "egress" {
if aws.ToString(request.TrafficType) == "egress" {
insertTable = "OUTPUT"
}

_, cmdErr := h.stopNetworkBlackHolePort(ctxWithTimeout, aws.StringValue(request.Protocol), port, chainName,
_, cmdErr := h.stopNetworkBlackHolePort(ctxWithTimeout, aws.ToString(request.Protocol), port, chainName,
networkMode, networkNSPath, insertTable, taskArn)

if err := ctxWithTimeout.Err(); errors.Is(err, context.DeadlineExceeded) {
Expand Down Expand Up @@ -505,9 +505,9 @@ func (h *FaultHandler) CheckNetworkBlackHolePort() func(http.ResponseWriter, *ht
networkMode := ecstypes.NetworkMode(taskMetadata.TaskNetworkConfig.NetworkMode)
taskArn := taskMetadata.TaskARN
stringToBeLogged := "Failed to check fault"
port := strconv.FormatUint(uint64(aws.Uint16Value(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.StringValue(request.TrafficType), aws.StringValue(request.Protocol), port)
running, _, cmdErr := h.checkNetworkBlackHolePort(ctxWithTimeout, aws.StringValue(request.Protocol), port, chainName,
port := strconv.FormatUint(uint64(aws.ToUint16(request.Port)), 10)
chainName := fmt.Sprintf("%s-%s-%s", aws.ToString(request.TrafficType), aws.ToString(request.Protocol), port)
running, _, cmdErr := h.checkNetworkBlackHolePort(ctxWithTimeout, aws.ToString(request.Protocol), port, chainName,
networkMode, networkNSPath, taskArn)

// We've timed out trying to check if the black hole port fault injection is running
Expand Down Expand Up @@ -1243,8 +1243,8 @@ func (h *FaultHandler) startNetworkLatencyFault(ctx context.Context, taskMetadat
if networkMode == ecstypes.NetworkModeAwsvpc {
nsenterPrefix = fmt.Sprintf(nsenterCommandString, taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].Path)
}
delayInMs := aws.Uint64Value(request.DelayMilliseconds)
jitterInMs := aws.Uint64Value(request.JitterMilliseconds)
delayInMs := aws.ToUint64(request.DelayMilliseconds)
jitterInMs := aws.ToUint64(request.JitterMilliseconds)

// Command to be executed:
// <nsenterPrefix> tc qdisc add dev <interfaceName> root handle 1: prio priomap 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
Expand Down Expand Up @@ -1304,7 +1304,7 @@ func (h *FaultHandler) startNetworkPacketLossFault(ctx context.Context, taskMeta
if networkMode == ecstypes.NetworkModeAwsvpc {
nsenterPrefix = fmt.Sprintf(nsenterCommandString, taskMetadata.TaskNetworkConfig.NetworkNamespaces[0].Path)
}
lossPercent := aws.Uint64Value(request.LossPercent)
lossPercent := aws.ToUint64(request.LossPercent)

// Command to be executed:
// <nsenterPrefix> tc qdisc add dev <interfaceName> root handle 1: prio priomap 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
Expand Down Expand Up @@ -1491,7 +1491,7 @@ func (h *FaultHandler) addIPAddressesToFilter(
ctx context.Context, ipAddressList []*string, taskMetadata *state.TaskResponse,
nsenterPrefix, commandString, interfaceName string) error {
for _, ip := range ipAddressList {
commandComposed := nsenterPrefix + fmt.Sprintf(commandString, interfaceName, aws.StringValue(ip))
commandComposed := nsenterPrefix + fmt.Sprintf(commandString, interfaceName, aws.ToString(ip))
cmdList := strings.Split(commandComposed, " ")
cmdOutput, err := h.runExecCommand(ctx, cmdList)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion ecs-agent/tmds/handlers/fault/v1/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
mock_state "github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/mocks"
"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig"
mock_execwrapper "github.com/aws/amazon-ecs-agent/ecs-agent/utils/execwrapper/mocks"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go-v2/aws"

"github.com/golang/mock/gomock"
"github.com/gorilla/mux"
Expand Down
6 changes: 3 additions & 3 deletions ecs-agent/tmds/handlers/fault/v1/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go-v2/aws"
)

const (
Expand Down Expand Up @@ -88,7 +88,7 @@ func (request *NetworkBlackholePortRequest) AddSourceToFilterIfNotAlready(source
request.SourcesToFilter = []*string{}
}
for _, src := range request.SourcesToFilter {
if aws.StringValue(src) == source {
if aws.ToString(src) == source {
return
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ func NewNetworkFaultInjectionErrorResponse(err string) NetworkFaultInjectionResp

func validateNetworkFaultRequestSources(sources []*string, sourcesType string) error {
for _, element := range sources {
if err := validateNetworkFaultRequestSource(aws.StringValue(element), sourcesType); err != nil {
if err := validateNetworkFaultRequestSource(aws.ToString(element), sourcesType); err != nil {
return err
}
}
Expand Down
8 changes: 4 additions & 4 deletions ecs-agent/tmds/handlers/fault/v1/types/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@ import (
"fmt"
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/stretchr/testify/require"
)

func TestNetworkBlackholePortAddSourceToFilterIfNotAlready(t *testing.T) {
t.Run("nil SourcesToFilter is initialized", func(t *testing.T) {
var req NetworkBlackholePortRequest = NetworkBlackholePortRequest{}
req.AddSourceToFilterIfNotAlready("1.2.3.4")
require.Equal(t, aws.StringValueSlice(req.SourcesToFilter), []string{"1.2.3.4"})
require.Equal(t, aws.ToStringSlice(req.SourcesToFilter), []string{"1.2.3.4"})
})
t.Run("Source can be added", func(t *testing.T) {
var req NetworkBlackholePortRequest = NetworkBlackholePortRequest{
SourcesToFilter: aws.StringSlice([]string{"8.8.8.8"}),
}
req.AddSourceToFilterIfNotAlready("1.2.3.4")
require.Equal(t, aws.StringValueSlice(req.SourcesToFilter), []string{"8.8.8.8", "1.2.3.4"})
require.Equal(t, aws.ToStringSlice(req.SourcesToFilter), []string{"8.8.8.8", "1.2.3.4"})
})
t.Run("Duplicate source is not added", func(t *testing.T) {
var req NetworkBlackholePortRequest = NetworkBlackholePortRequest{
SourcesToFilter: aws.StringSlice([]string{"8.8.8.8", "1.2.3.4"}),
}
req.AddSourceToFilterIfNotAlready("1.2.3.4")
require.Equal(t, aws.StringValueSlice(req.SourcesToFilter), []string{"8.8.8.8", "1.2.3.4"})
require.Equal(t, aws.ToStringSlice(req.SourcesToFilter), []string{"8.8.8.8", "1.2.3.4"})
})
}

Expand Down
2 changes: 1 addition & 1 deletion ecs-agent/tmds/handlers/taskprotection/v1/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state"
commonutils "github.com/aws/amazon-ecs-agent/ecs-agent/utils"

"github.com/aws/aws-sdk-go-v2/aws"
awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
"github.com/aws/aws-sdk-go-v2/service/ecs"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/smithy-go"
Expand Down
Loading
Loading