Merge pull request #3094 from olucasfreitas/OCM-18910-lint

OCM-18910 | fix: Fix linter errors for #3093

Author: openshift-merge-bot[bot]

pkg/aws/client.go

@@ -223,7 +223,8 @@ type Client interface {
 	ListPolicyVersions(policyArn string) ([]PolicyVersion, error)
 	GetCallerIdentity() (*sts.GetCallerIdentityOutput, error)
 	CheckIfMachinePoolHasDedicatedHost(instanceIDs []string) (bool, error)
-	CreateStackWithParamsTags(ctx context.Context, cfTemplateBody, stackName string, stackParams, stackTags map[string]string) (*string, error)
+	CreateStackWithParamsTags(ctx context.Context, cfTemplateBody, stackName string,
+		stackParams, stackTags map[string]string) (*string, error)
 	GetCFStack(ctx context.Context, stackName string) (*cftypes.Stack, error)
 	DescribeCFStackResources(ctx context.Context, stackName string) (*[]cftypes.StackResource, error)
 	DeleteCFStack(ctx context.Context, stackName string) error
@@ -559,7 +560,7 @@ func (c *awsClient) FetchPublicSubnetMap(subnets []ec2types.Subnet) (map[string]
 		}
 		if routeTablesResp == nil {
 			return mapSubnetIdToPublic, fmt.Errorf(
-				"No route table found for associated subnets '%s'",
+				"no route table found for associated subnets '%s'",
 				helper.SliceToSortedString(aws.ToStringSlice(subnetIds)),
 			)
 		}
@@ -823,7 +824,7 @@ func (c *awsClient) ValidateCredentials() (bool, error) {
 	_, err := c.stsClient.GetCallerIdentity(context.Background(), &sts.GetCallerIdentityInput{})
 	if err != nil {
 		if strings.Contains(fmt.Sprintf("%s", err), "InvalidClientTokenId") {
-			awsErr := fmt.Errorf("Invalid AWS Credentials: %s.\n For help configuring your credentials, see %s",
+			awsErr := fmt.Errorf("invalid AWS Credentials: %s.\n For help configuring your credentials, see %s",
 				err,
 				"https://docs.openshift.com/rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/"+
 					"rosa-config-aws-account.html#rosa-configuring-aws-account_rosa-config-aws-account")
@@ -1137,7 +1138,7 @@ func (c *awsClient) GetAvailabilityZoneType(availabilityZoneName string) (string
 		return "", err
 	}
 	if len(availabilityZones.AvailabilityZones) < 1 {
-		return "", fmt.Errorf("Failed to find availability zone '%s'", availabilityZoneName)
+		return "", fmt.Errorf("failed to find availability zone '%s'", availabilityZoneName)
 	}
 	return aws.ToString(availabilityZones.AvailabilityZones[0].ZoneType), nil
 }
@@ -1435,7 +1436,8 @@ func (c *awsClient) ListServiceAccountRoles(clusterName string) ([]iamtypes.Role
 			}
 
 			for _, tag := range listTagsResult.Tags {
-				if aws.ToString(tag.Key) == iamserviceaccount.RoleTypeTagKey && aws.ToString(tag.Value) == iamserviceaccount.ServiceAccountRoleType {
+				if aws.ToString(tag.Key) == iamserviceaccount.RoleTypeTagKey &&
+					aws.ToString(tag.Value) == iamserviceaccount.ServiceAccountRoleType {
 					isServiceAccountRole = true
 				}
 				if aws.ToString(tag.Key) == iamserviceaccount.ClusterTagKey && aws.ToString(tag.Value) == clusterName {
@@ -1460,17 +1462,19 @@ func (c *awsClient) ListServiceAccountRoles(clusterName string) ([]iamtypes.Role
 }
 
 // GetServiceAccountRoleDetails gets detailed information about a service account role using existing methods
-func (c *awsClient) GetServiceAccountRoleDetails(roleName string) (*iamtypes.Role, []iamtypes.AttachedPolicy, []string, error) {
+func (c *awsClient) GetServiceAccountRoleDetails(roleName string) (
+	*iamtypes.Role, []iamtypes.AttachedPolicy, []string, error) {
 	// Use existing GetRoleByName method
 	role, err := c.GetRoleByName(roleName)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("failed to get role %s: %w", roleName, err)
 	}
 
 	// Get attached managed policies
-	listAttachedPoliciesResult, err := c.iamClient.ListAttachedRolePolicies(context.Background(), &iam.ListAttachedRolePoliciesInput{
-		RoleName: aws.String(roleName),
-	})
+	listAttachedPoliciesResult, err := c.iamClient.ListAttachedRolePolicies(context.Background(),
+		&iam.ListAttachedRolePoliciesInput{
+			RoleName: aws.String(roleName),
+		})
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("failed to list attached policies for role %s: %w", roleName, err)
 	}

pkg/aws/client_test.go

@@ -515,8 +515,8 @@ var _ = Describe("Client", func() {
 
 			valid, err := client.ValidateCredentials()
 			Expect(valid).To(BeFalse())
-			Expect(err.Error()).To(ContainSubstring(
-				"Invalid AWS Credentials: %s.\n For help configuring your credentials, see", errMsg))
+			expectedErr := fmt.Sprintf("invalid AWS Credentials: %s.\n For help configuring your credentials, see", errMsg)
+			Expect(err.Error()).To(ContainSubstring(expectedErr))
 		})
 
 		It("Does not wrap other errors and returns false", func() {

pkg/machinepool/validation.go

@@ -13,12 +13,12 @@ func ValidateKubeletConfig(input interface{}) error {
 		return validateCount(answers)
 	}
 
-	return fmt.Errorf("Input for kubelet config flag is not valid")
+	return fmt.Errorf("input for kubelet config flag is not valid")
 }
 
 func validateCount[K any](kubeletConfigs []K) error {
 	if len(kubeletConfigs) > 1 {
-		return fmt.Errorf("Only a single kubelet config is supported for Machine Pools")
+		return fmt.Errorf("only a single kubelet config is supported for Machine Pools")
 	}
 	return nil
 }
@@ -27,35 +27,35 @@ func validateEditInput(poolType string, autoscaling bool, minReplicas int, maxRe
 	isReplicasSet bool, isAutoscalingSet bool, isMinReplicasSet bool, isMaxReplicasSet bool, id string) error {
 
 	if autoscaling && minReplicas < 0 && isMinReplicasSet {
-		return fmt.Errorf("Min replicas must be a non-negative number when autoscaling is set")
+		return fmt.Errorf("min replicas must be a non-negative number when autoscaling is set")
 	}
 
 	if autoscaling && maxReplicas < 0 && isMaxReplicasSet {
-		return fmt.Errorf("Max replicas must be a non-negative number when autoscaling is set")
+		return fmt.Errorf("max replicas must be a non-negative number when autoscaling is set")
 	}
 
 	if !autoscaling && replicas < 0 {
-		return fmt.Errorf("Replicas must be a non-negative number")
+		return fmt.Errorf("replicas must be a non-negative number")
 	}
 
 	if autoscaling && isReplicasSet && isAutoscalingSet {
-		return fmt.Errorf("Autoscaling enabled on %s pool '%s'. can't set replicas", poolType, id)
+		return fmt.Errorf("autoscaling enabled on %s pool '%s'. can't set replicas", poolType, id)
 	}
 
 	if autoscaling && isAutoscalingSet && maxReplicas < minReplicas {
-		return fmt.Errorf("Max replicas must not be greater than min replicas when autoscaling is enabled")
+		return fmt.Errorf("max replicas must not be greater than min replicas when autoscaling is enabled")
 	}
 
 	if !autoscaling && (isMinReplicasSet || isMaxReplicasSet) {
-		return fmt.Errorf("Autoscaling disabled on %s pool '%s'. can't set min or max replicas", poolType, id)
+		return fmt.Errorf("autoscaling disabled on %s pool '%s'. can't set min or max replicas", poolType, id)
 	}
 
 	return nil
 }
 
 func validateCapacityReservationId(proposedId, nodepoolId, existingId string) error {
 	if existingId != "" {
-		return fmt.Errorf("Unable to change 'capacity-reservation-id' to '%s'. AWS NodePool '%s' already has a "+
+		return fmt.Errorf("unable to change 'capacity-reservation-id' to '%s'. AWS NodePool '%s' already has a "+
 			"Capacity Reservation ID: '%s'", proposedId, nodepoolId, existingId)
 	}
 	return nil

pkg/machinepool/validation_test.go

@@ -13,7 +13,7 @@ var _ = Describe("MachinePool validation", func() {
 			kubeletConfigs := []string{"foo", "bar"}
 			err := ValidateKubeletConfig(kubeletConfigs)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(Equal("Only a single kubelet config is supported for Machine Pools"))
+			Expect(err.Error()).To(Equal("only a single kubelet config is supported for Machine Pools"))
 		})
 
 		It("Fails if customer requests more than 1 kubelet config via []core.OptionAnswer", func() {
@@ -29,7 +29,7 @@ var _ = Describe("MachinePool validation", func() {
 			}
 			err := ValidateKubeletConfig(kubeletConfigs)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(Equal("Only a single kubelet config is supported for Machine Pools"))
+			Expect(err.Error()).To(Equal("only a single kubelet config is supported for Machine Pools"))
 		})
 
 		It("Passes if a customer selects only a single kubelet config via []core.OptionAnswer", func() {
@@ -62,7 +62,7 @@ var _ = Describe("MachinePool validation", func() {
 		It("Fails if the input is not a []string or []core.OptionAnswer", func() {
 			err := ValidateKubeletConfig("foo")
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(Equal("Input for kubelet config flag is not valid"))
+			Expect(err.Error()).To(Equal("input for kubelet config flag is not valid"))
 		})
 	})
 	Context("Validate edit machinepool options", func() {
@@ -116,7 +116,7 @@ var _ = Describe("MachinePool validation", func() {
 		})
 		It("Fails when capacity reservation ID is set", func() {
 			Expect(validateCapacityReservationId("new-id", "aws-nodepool-1", "old-id").Error()).
-				Should(ContainSubstring("Unable to change 'capacity-reservation-id' to 'new-id'. " +
+				Should(ContainSubstring("unable to change 'capacity-reservation-id' to 'new-id'. " +
 					"AWS NodePool 'aws-nodepool-1' already has a Capacity Reservation ID: 'old-id'"))
 		})
 	})