correct linter errors

Author: BraeTroutman

api/v1beta2/awsmachine_types.go

@@ -235,7 +235,7 @@ type AWSMachineSpec struct {
 	MarketType MarketType `json:"marketType,omitempty"`
 
 	// CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
-	// "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+	// "Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
 	// "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
 	// "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
 	// +optional

api/v1beta2/types.go

@@ -275,7 +275,7 @@ type Instance struct {
 	MarketType MarketType `json:"marketType,omitempty"`
 
 	// CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
-	// "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+	// "Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
 	// "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
 	// "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
 	// +optional

exp/api/v1beta2/types.go

@@ -148,7 +148,7 @@ type AWSLaunchTemplate struct {
 	MarketType infrav1.MarketType `json:"marketType,omitempty"`
 
 	// CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
-	// "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+	// "Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
 	// "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
 	// "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
 	// +optional

pkg/cloud/services/ec2/helper_test.go

@@ -61,45 +61,6 @@ func setupMachinePoolScope(cl client.Client, ec2Scope scope.EC2Scope) (*scope.Ma
 	})
 }
 
-func setupCapacityBlocksMachinePoolScope(cl client.Client, ec2Scope scope.EC2Scope) (*scope.MachinePoolScope, error) {
-	return scope.NewMachinePoolScope(scope.MachinePoolScopeParams{
-		Client:         cl,
-		InfraCluster:   ec2Scope,
-		Cluster:        newCluster(),
-		MachinePool:    newMachinePool(),
-		AWSMachinePool: newAWSCapacityBlockMachinePool(),
-	})
-}
-
-func newAWSCapacityBlockMachinePool() *expinfrav1.AWSMachinePool {
-	return &expinfrav1.AWSMachinePool{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "AWSMachinePool",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "aws-mp-name",
-			Namespace: "aws-mp-ns",
-		},
-		Spec: expinfrav1.AWSMachinePoolSpec{
-			AvailabilityZones: []string{"us-east-1"},
-			AdditionalTags:    infrav1.Tags{},
-			AWSLaunchTemplate: expinfrav1.AWSLaunchTemplate{
-				Name:                  "aws-launch-template",
-				IamInstanceProfile:    "instance-profile",
-				AMI:                   infrav1.AMIReference{},
-				InstanceType:          "t3.large",
-				SSHKeyName:            aws.String("default"),
-				MarketType:            infrav1.MarketTypeCapacityBlock,
-				CapacityReservationID: aws.String("cr-12345678901234567"),
-			},
-		},
-		Status: expinfrav1.AWSMachinePoolStatus{
-			LaunchTemplateID: "launch-template-id",
-		},
-	}
-}
-
 func defaultEC2Tags(name, clusterName string) []types.Tag {
 	return []types.Tag{
 		{

pkg/cloud/services/ec2/launchtemplate.go

@@ -848,6 +848,8 @@ func SDKToSpotMarketOptions(instanceMarketOptions *types.LaunchTemplateInstanceM
 	return result
 }
 
+// SDKToCapacityReservationPreference maps an AWS SDK Capacity Reservation Preference onto the CAPA internal CapacityReservationPreference type.
+// inverse to `CapacityReservationPreferenceToSDK`.
 func SDKToCapacityReservationPreference(preference types.CapacityReservationPreference) infrav1.CapacityReservationPreference {
 	switch preference {
 	case types.CapacityReservationPreferenceCapacityReservationsOnly:
@@ -861,6 +863,8 @@ func SDKToCapacityReservationPreference(preference types.CapacityReservationPref
 	}
 }
 
+// CapacityReservationPreferenceToSDK maps a CAPA internal Capacity Reservation Preference enum type onto the AWS SDK equivalent.
+// inverse to `SDKToCapacityReservationPreference`.
 func CapacityReservationPreferenceToSDK(preference infrav1.CapacityReservationPreference) types.CapacityReservationPreference {
 	switch preference {
 	case infrav1.CapacityReservationPreferenceNone: