Fix: misc type fixes

Author: Thean Lim

agent/api/task/task_windows_test.go

@@ -76,7 +76,7 @@ func TestPostUnmarshalWindowsCanonicalPaths(t *testing.T) {
 		Volumes: []acstypes.Volume{
 			{
 				Name: strptr("sourceVolume"),
-				Type: strptr("host"),
+				Type: "host",
 				Host: &acstypes.HostVolumeProperties{
 					SourcePath: strptr(`C:/Host/path`),
 				},
@@ -112,7 +112,7 @@ func TestPostUnmarshalWindowsCanonicalPaths(t *testing.T) {
 		},
 	}
 
-	seqNum := int64(42)
+	seqNum := int32(42)
 	task, err := TaskFromACS(&taskFromAcs, &acs.PayloadInput{SeqNum: &seqNum})
 	assert.Nil(t, err, "Should be able to handle acs task")
 	cfg := config.Config{TaskCPUMemLimit: config.BooleanDefaultTrue{Value: config.ExplicitlyDisabled}}
@@ -498,7 +498,7 @@ func TestPostUnmarshalTaskWithFSxWindowsFileServerVolumes(t *testing.T) {
 		Volumes: []acstypes.Volume{
 			{
 				Name: strptr("fsxWindowsFileServerVolume"),
-				Type: strptr("fsxWindowsFileServer"),
+				Type: "fsxWindowsFileServer",
 				FsxWindowsFileServerVolumeConfiguration: &acstypes.FSxWindowsFileServerVolumeConfiguration{
 					AuthorizationConfig: &acstypes.FSxWindowsFileServerAuthorizationConfig{
 						CredentialsParameter: strptr("arn"),

ecs-agent/netlib/network_builder_windows_test.go

@@ -27,7 +27,7 @@ import (
 	mock_netwrapper "github.com/aws/amazon-ecs-agent/ecs-agent/utils/netwrapper/mocks"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/acs"
+	acstypes "github.com/aws/aws-sdk-go-v2/service/acs/types"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
@@ -39,7 +39,7 @@ func TestNetworkBuilder_BuildTaskNetworkConfiguration(t *testing.T) {
 // getTestFunc returns a test function that verifies the capability of the networkBuilder
 // to translate a given input task payload into desired network data models.
 func getTestFunc(
-	dataGenF func(string) (input *acs.Task, expected tasknetworkconfig.TaskNetworkConfig),
+	dataGenF func(string) (input *acstypes.Task, expected tasknetworkconfig.TaskNetworkConfig),
 	plt string,
 ) func(*testing.T) {
 
@@ -65,7 +65,7 @@ func getTestFunc(
 		var ifaces []net.Interface
 		idx := 1
 		for _, eni := range taskPayload.ElasticNetworkInterfaces {
-			mac := aws.StringValue(eni.MacAddress)
+			mac := aws.ToString(eni.MacAddress)
 			hw, err := net.ParseMAC(mac)
 			require.NoError(t, err)
 			ifaces = append(ifaces, net.Interface{

ecs-agent/netlib/platform/containerd_windows.go

@@ -105,13 +105,13 @@ func (c *containerd) buildAWSVPCNetworkConfig(
 	}
 
 	// Find primary network interface in order to build the task netns name.
-	var primaryIF *acstypes.ElasticNetworkInterface
+	var primaryIF acstypes.ElasticNetworkInterface
 	for _, eni := range taskPayload.ElasticNetworkInterfaces {
-		if aws.ToInt64(eni.Index) == 0 {
+		if aws.ToInt32(eni.Index) == 0 {
 			primaryIF = eni
 		}
 	}
-	ifName := networkinterface.GetInterfaceName(primaryIF)
+	ifName := networkinterface.GetInterfaceName(&primaryIF)
 	netNSName := networkinterface.NetNSName(taskID, ifName)
 	netNSPath := c.GetNetNSPath(netNSName)
 
@@ -128,11 +128,15 @@ func (c *containerd) buildAWSVPCNetworkConfig(
 		"MacToNames": macToNames,
 	})
 
+	eniPointerSlice := make([]*acstypes.ElasticNetworkInterface, len(taskPayload.ElasticNetworkInterfaces))
+	for i := range taskPayload.ElasticNetworkInterfaces {
+		eniPointerSlice[i] = &taskPayload.ElasticNetworkInterfaces[i]
+	}
 	// Create interface object.
 	iface, err := networkinterface.New(
-		taskPayload.ElasticNetworkInterfaces[0],
+		&taskPayload.ElasticNetworkInterfaces[0],
 		"",
-		taskPayload.ElasticNetworkInterfaces,
+		eniPointerSlice,
 		macToNames,
 	)
 	iface.Default = true