Merge pull request #1463 from vincepri/remove-get-rootdevicesize

⚠️ Remove check for root volume size

Author: k8s-ci-robot

pkg/cloud/services/ec2/instances.go

@@ -541,28 +541,6 @@ func (s *Service) getImageRootDevice(imageID string) (*string, error) {
 	return output.Images[0].RootDeviceName, nil
 }
 
-func (s *Service) getInstanceRootDeviceSize(instance *ec2.Instance) (*int64, error) {
-	for _, bdm := range instance.BlockDeviceMappings {
-		if aws.StringValue(bdm.DeviceName) == aws.StringValue(instance.RootDeviceName) {
-			input := &ec2.DescribeVolumesInput{
-				VolumeIds: []*string{bdm.Ebs.VolumeId},
-			}
-
-			out, err := s.scope.EC2.DescribeVolumes(input)
-			if err != nil {
-				return nil, err
-			}
-
-			if len(out.Volumes) == 0 {
-				return nil, errors.Errorf("no volumes found for id %q", aws.StringValue(bdm.Ebs.VolumeId))
-			}
-
-			return out.Volumes[0].Size, nil
-		}
-	}
-	return nil, errors.Errorf("no root volume found for EC2 instance %q", *instance.InstanceId)
-}
-
 // SDKToInstance converts an AWS EC2 SDK instance to the CAPA instance type.
 // SDKToInstance populates all instance fields except for rootVolumeSize,
 // because EC2.DescribeInstances does not return the size of storage devices. An
@@ -599,12 +577,6 @@ func (s *Service) SDKToInstance(v *ec2.Instance) (*infrav1.Instance, error) {
 		i.Tags = converters.TagsToMap(v.Tags)
 	}
 
-	rootSize, err := s.getInstanceRootDeviceSize(v)
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to get root volume size for instance: %q", aws.StringValue(v.InstanceId))
-	}
-	i.RootDeviceSize = aws.Int64Value(rootSize)
-
 	i.Addresses = s.getInstanceAddresses(v)
 
 	return i, nil

pkg/cloud/services/ec2/instances_test.go

@@ -102,16 +102,6 @@ func TestInstanceIfExists(t *testing.T) {
 						},
 					}, nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {
@@ -142,42 +132,6 @@ func TestInstanceIfExists(t *testing.T) {
 				}
 			},
 		},
-		{
-			name:       "instance without root volume, returns error",
-			instanceID: "one",
-			expect: func(m *mock_ec2iface.MockEC2APIMockRecorder) {
-				m.DescribeInstances(&ec2.DescribeInstancesInput{
-					InstanceIds: []*string{aws.String("one")},
-				}).
-					Return(&ec2.DescribeInstancesOutput{
-						Reservations: []*ec2.Reservation{
-							{
-								Instances: []*ec2.Instance{
-									{
-										InstanceId:   aws.String("id-1"),
-										InstanceType: aws.String("m5.large"),
-										SubnetId:     aws.String("subnet-1"),
-										ImageId:      aws.String("ami-1"),
-										IamInstanceProfile: &ec2.IamInstanceProfile{
-											Arn: aws.String("arn:aws:iam::123456789012:instance-profile/foo"),
-										},
-										State: &ec2.InstanceState{
-											Code: aws.Int64(16),
-											Name: aws.String(ec2.StateAvailable),
-										},
-										RootDeviceName: aws.String("404-not-found"),
-									},
-								},
-							},
-						},
-					}, nil)
-			},
-			check: func(i *infrav1.Instance, err error) {
-				if err == nil {
-					t.Fatalf("expected an error but got none.")
-				}
-			},
-		},
 	}
 
 	for _, tc := range testCases {
@@ -394,16 +348,6 @@ func TestCreateInstance(t *testing.T) {
 				m.WaitUntilInstanceRunningWithContext(gomock.Any(), gomock.Any(), gomock.Any()).
 					Return(nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {
@@ -518,16 +462,6 @@ func TestCreateInstance(t *testing.T) {
 				m.WaitUntilInstanceRunningWithContext(gomock.Any(), gomock.Any(), gomock.Any()).
 					Return(nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {
@@ -655,16 +589,6 @@ func TestCreateInstance(t *testing.T) {
 				m.WaitUntilInstanceRunningWithContext(gomock.Any(), gomock.Any(), gomock.Any()).
 					Return(nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {
@@ -788,16 +712,6 @@ func TestCreateInstance(t *testing.T) {
 				m.WaitUntilInstanceRunningWithContext(gomock.Any(), gomock.Any(), gomock.Any()).
 					Return(nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {
@@ -922,16 +836,6 @@ func TestCreateInstance(t *testing.T) {
 				m.WaitUntilInstanceRunningWithContext(gomock.Any(), gomock.Any(), gomock.Any()).
 					Return(nil)
 
-				m.DescribeVolumes(gomock.Eq(&ec2.DescribeVolumesInput{
-					VolumeIds: []*string{aws.String("volume-1")},
-				})).Return(&ec2.DescribeVolumesOutput{
-					Volumes: []*ec2.Volume{
-						{
-							VolumeId: aws.String("volume-1"),
-							Size:     aws.Int64(60),
-						},
-					},
-				}, nil)
 			},
 			check: func(instance *infrav1.Instance, err error) {
 				if err != nil {