diff --git a/mocks/amazon-vcp-resource-controller-k8s/pkg/aws/ec2/api/mock_ec2_wrapper.go b/mocks/amazon-vcp-resource-controller-k8s/pkg/aws/ec2/api/mock_ec2_wrapper.go index 1bbb98d6..9b906857 100644 --- a/mocks/amazon-vcp-resource-controller-k8s/pkg/aws/ec2/api/mock_ec2_wrapper.go +++ b/mocks/amazon-vcp-resource-controller-k8s/pkg/aws/ec2/api/mock_ec2_wrapper.go @@ -244,10 +244,10 @@ func (mr *MockEC2WrapperMockRecorder) ModifyNetworkInterfaceAttribute(arg0 inter } // UnassignPrivateIPAddresses mocks base method. -func (m *MockEC2Wrapper) UnassignPrivateIPAddresses(arg0 *ec20.UnassignPrivateIpAddressesInput) (*ec20.UnassignPrivateIpAddressesOutput, error) { +func (m *MockEC2Wrapper) UnassignPrivateIPAddresses(arg0 *ec2.UnassignPrivateIpAddressesInput) (*ec2.UnassignPrivateIpAddressesOutput, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UnassignPrivateIPAddresses", arg0) - ret0, _ := ret[0].(*ec20.UnassignPrivateIpAddressesOutput) + ret0, _ := ret[0].(*ec2.UnassignPrivateIpAddressesOutput) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/pkg/aws/ec2/api/helper.go b/pkg/aws/ec2/api/helper.go index 891de4c0..97f66890 100644 --- a/pkg/aws/ec2/api/helper.go +++ b/pkg/aws/ec2/api/helper.go @@ -547,19 +547,19 @@ func (h *ec2APIHelper) AssignIPv4ResourcesAndWaitTillReady(eniID string, resourc // UnassignIPv4Resources un-assigns IPv4 address or prefix from the interface and waits till it succeeds func (h *ec2APIHelper) UnassignIPv4Resources(eniID string, resourceType config.ResourceType, resources []string) error { - unassignPrivateIpAddressesInput := &ec2.UnassignPrivateIpAddressesInput{} + unassignPrivateIpAddressesInput := &ec2v2.UnassignPrivateIpAddressesInput{} // Use respective input param depending on which resource type is being unassigned switch resourceType { case config.ResourceTypeIPv4Address: - unassignPrivateIpAddressesInput = &ec2.UnassignPrivateIpAddressesInput{ + unassignPrivateIpAddressesInput = &ec2v2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: &eniID, - PrivateIpAddresses: aws.StringSlice(resources), + PrivateIpAddresses: resources, } case config.ResourceTypeIPv4Prefix: - unassignPrivateIpAddressesInput = &ec2.UnassignPrivateIpAddressesInput{ + unassignPrivateIpAddressesInput = &ec2v2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: &eniID, - Ipv4Prefixes: aws.StringSlice(resources), + Ipv4Prefixes: resources, } } diff --git a/pkg/aws/ec2/api/wrapper.go b/pkg/aws/ec2/api/wrapper.go index 82704cf8..ca76a988 100644 --- a/pkg/aws/ec2/api/wrapper.go +++ b/pkg/aws/ec2/api/wrapper.go @@ -55,7 +55,7 @@ type EC2Wrapper interface { DetachNetworkInterface(input *ec2v2.DetachNetworkInterfaceInput) (*ec2v2.DetachNetworkInterfaceOutput, error) DeleteNetworkInterface(input *ec2v2.DeleteNetworkInterfaceInput) (*ec2v2.DeleteNetworkInterfaceOutput, error) AssignPrivateIPAddresses(input *ec2v2.AssignPrivateIpAddressesInput) (*ec2v2.AssignPrivateIpAddressesOutput, error) - UnassignPrivateIPAddresses(input *ec2.UnassignPrivateIpAddressesInput) (*ec2.UnassignPrivateIpAddressesOutput, error) + UnassignPrivateIPAddresses(input *ec2v2.UnassignPrivateIpAddressesInput) (*ec2v2.UnassignPrivateIpAddressesOutput, error) DescribeNetworkInterfaces(input *ec2v2.DescribeNetworkInterfacesInput) (*ec2v2.DescribeNetworkInterfacesOutput, error) CreateTags(input *ec2v2.CreateTagsInput) (*ec2v2.CreateTagsOutput, error) DescribeSubnets(input *ec2v2.DescribeSubnetsInput) (*ec2v2.DescribeSubnetsOutput, error) @@ -691,9 +691,9 @@ func (e *ec2Wrapper) AssignPrivateIPAddresses(input *ec2v2.AssignPrivateIpAddres return output, err } -func (e *ec2Wrapper) UnassignPrivateIPAddresses(input *ec2.UnassignPrivateIpAddressesInput) (*ec2.UnassignPrivateIpAddressesOutput, error) { +func (e *ec2Wrapper) UnassignPrivateIPAddresses(input *ec2v2.UnassignPrivateIpAddressesInput) (*ec2v2.UnassignPrivateIpAddressesOutput, error) { start := time.Now() - unAssignPrivateIPAddressesOutput, err := e.userServiceClient.UnassignPrivateIpAddresses(input) + output, err := e.userServiceClientV2.UnassignPrivateIpAddresses(context.Background(), input) ec2APICallLatencies.WithLabelValues("unassign_private_ip").Observe(timeSinceMs(start)) // Metric updates @@ -710,7 +710,7 @@ func (e *ec2Wrapper) UnassignPrivateIPAddresses(input *ec2.UnassignPrivateIpAddr ec2UnassignPrivateIPAddressAPIErrCnt.Inc() } - return unAssignPrivateIPAddressesOutput, err + return output, err } func (e *ec2Wrapper) CreateTags(input *ec2v2.CreateTagsInput) (*ec2v2.CreateTagsOutput, error) {