Migrate ECS client to aws-sdk-go-v2

ecs-agent/utils/utils.go

@@ -42,17 +42,6 @@ func ZeroOrNil(obj interface{}) bool {
 	return false
 }
 
-// Uint16SliceToStringPtrSlice converts a slice of type uint16 to a slice of type
-// *string. It uses strconv.Itoa on each element
-func Uint16SliceToStringPtrSlice(slice []uint16) []*string {
-	stringSlice := make([]*string, len(slice))
-	for i, el := range slice {
-		str := strconv.Itoa(int(el))
-		stringSlice[i] = &str
-	}
-	return stringSlice
-}
-
 // Uint16SliceToStringSlice converts a slice of type uint16 to a slice of type
 // string. It uses strconv.Itoa on each element
 func Uint16SliceToStringSlice(slice []uint16) []string {
@@ -64,12 +53,20 @@ func Uint16SliceToStringSlice(slice []uint16) []string {
 	return stringSlice
 }
 
-// Int64PtrToIntPtr converts a *int64 to *int.
-func Int64PtrToIntPtr(int64ptr *int64) *int {
+// Int32PtrToIntPtr converts a *int64 to *int.
+func Int32PtrToIntPtr(int32ptr *int32) *int {
+	if int32ptr == nil {
+		return nil
+	}
+	return aws.Int(int(aws.Int32Value(int32ptr)))
+}
+
+// Int64PtrToInt32Ptr converts a *int64 to *int32.
+func Int64PtrToInt32Ptr(int64ptr *int64) *int32 {
 	if int64ptr == nil {
 		return nil
 	}
-	return aws.Int(int(aws.Int64Value(int64ptr)))
+	return aws.Int32(int32(aws.Int64Value(int64ptr)))
 }
 
 // MaxNum returns the maximum value between two numbers.

ecs-agent/utils/utils_test.go

@@ -83,36 +83,28 @@ func TestUint16SliceToStringSlice(t *testing.T) {
 			stringSlice := Uint16SliceToStringSlice(tc.param)
 			assert.Equal(t, tc.expected, len(stringSlice), tc.name)
 
-			stringPtrSlice := Uint16SliceToStringPtrSlice(tc.param)
-			assert.Equal(t, tc.expected, len(stringPtrSlice), tc.name)
-
 			for idx, num := range tc.param {
 				reconverted, err := strconv.Atoi(stringSlice[idx])
 				assert.NoError(t, err)
 				assert.Equal(t, num, uint16(reconverted))
-
-				assert.NotNil(t, stringPtrSlice[idx])
-				reconverted, err = strconv.Atoi(*stringPtrSlice[idx])
-				assert.NoError(t, err)
-				assert.Equal(t, num, uint16(reconverted))
 			}
 		})
 	}
 }
 
-func TestInt64PtrToIntPtr(t *testing.T) {
+func TestInt32PtrToIntPtr(t *testing.T) {
 	testCases := []struct {
-		input          *int64
+		input          *int32
 		expectedOutput *int
 		name           string
 	}{
 		{nil, nil, "nil"},
-		{aws.Int64(2147483647), aws.Int(2147483647), "smallest max value type int can hold"},
+		{aws.Int32(2147483647), aws.Int(2147483647), "smallest max value type int can hold"},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expectedOutput, Int64PtrToIntPtr(tc.input))
+			assert.Equal(t, tc.expectedOutput, Int32PtrToIntPtr(tc.input))
 		})
 	}
 }