fixing linter linter issues

Author: jdwtf

cmd/eksctl/logger.go

@@ -101,7 +101,7 @@ func dumpLogsToDisk(logBuffer *bytes.Buffer, errorString string) error {
 	if _, err := os.Stat("logs/"); os.IsNotExist(err) {
 
 		if err := os.Mkdir("logs/", 0755); err != nil {
-			return fmt.Errorf(err.Error())
+			return fmt.Errorf("%s", err.Error())
 		}
 	}
 

integration/tests/crud/creategetdelete_test.go

@@ -1271,7 +1271,9 @@ func createAdditionalSubnet(cfg *api.ClusterConfig) string {
 	var (
 		i1, i2, i3, i4, ic int
 	)
-	fmt.Sscanf(cidr, "%d.%d.%d.%d/%d", &i1, &i2, &i3, &i4, &ic)
+	n, err := fmt.Sscanf(cidr, "%d.%d.%d.%d/%d", &i1, &i2, &i3, &i4, &ic)
+	Expect(err).NotTo(HaveOccurred())
+	Expect(n > 4).To(BeTrue())
 	cidr = fmt.Sprintf("%d.%d.%s.%d/%d", i1, i2, "255", i4, ic)
 
 	var tags []ec2types.Tag

pkg/actions/accessentry/task.go

@@ -136,7 +136,7 @@ func runAllTasks(taskTree *tasks.TaskTree) error {
 		for _, err := range errs {
 			allErrs = append(allErrs, err.Error())
 		}
-		return fmt.Errorf(strings.Join(allErrs, "\n"))
+		return fmt.Errorf("%s", strings.Join(allErrs, "\n"))
 	}
 	completedAction := func() string {
 		if taskTree.PlanMode {

pkg/actions/addon/tasks.go

@@ -221,7 +221,7 @@ func runAllTasks(taskTree *tasks.TaskTree) error {
 		for _, err := range errs {
 			allErrs = append(allErrs, err.Error())
 		}
-		return fmt.Errorf(strings.Join(allErrs, "\n"))
+		return fmt.Errorf("%s", strings.Join(allErrs, "\n"))
 	}
 	completedAction := func() string {
 		if taskTree.PlanMode {

pkg/actions/anywhere/anywhere.go

@@ -38,7 +38,7 @@ func IsAnywhereCommand(args []string) (bool, error) {
 // RunAnywhereCommand executes the anywhere binary.
 func RunAnywhereCommand(args []string) (int, error) {
 	if _, err := exec.LookPath(BinaryFileName); errors.Is(err, exec.ErrNotFound) {
-		return 1, fmt.Errorf(fmt.Sprintf("%q plugin was not found on your path", BinaryFileName))
+		return 1, fmt.Errorf("%s", fmt.Sprintf("%q plugin was not found on your path", BinaryFileName))
 	} else if err != nil {
 		return 1, fmt.Errorf("failed to lookup anywhere plugin: %w", err)
 	}

pkg/actions/podidentityassociation/tasks.go

@@ -246,7 +246,7 @@ func runAllTasks(taskTree *tasks.TaskTree) error {
 		for _, err := range errs {
 			allErrs = append(allErrs, err.Error())
 		}
-		return fmt.Errorf(strings.Join(allErrs, "\n"))
+		return fmt.Errorf("%s", strings.Join(allErrs, "\n"))
 	}
 	completedAction := func() string {
 		if taskTree.PlanMode {

pkg/apis/eksctl.io/v1alpha5/addon.go

@@ -171,7 +171,7 @@ func (a Addon) checkAtMostOnePolicyProviderIsSet() error {
 		setPolicyProviders++
 	}
 
-	if a.AttachPolicyARNs != nil && len(a.AttachPolicyARNs) > 0 {
+	if len(a.AttachPolicyARNs) > 0 {
 		setPolicyProviders++
 	}
 

pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go

@@ -366,7 +366,7 @@ func (m *commonMatcher) matchJSON(actual interface{}, js []byte) (bool, error) {
 		return false, nil
 	}
 	if !ok {
-		m.err = fmt.Errorf(jsMatcher.FailureMessage(js))
+		m.err = fmt.Errorf("%s", jsMatcher.FailureMessage(js))
 	}
 	return ok, nil
 }

pkg/cfn/template/matchers/matchers.go

@@ -100,7 +100,7 @@ var _ = Describe("eksctl API", func() {
 	},
 		Entry("fails to load default config", newAWSProviderEntry{
 			updateFakes: func(fal *fakes.FakeAWSConfigurationLoader) {
-				fal.LoadDefaultConfigReturns(*aws.NewConfig(), fmt.Errorf(genericError))
+				fal.LoadDefaultConfigReturns(*aws.NewConfig(), fmt.Errorf("%v", genericError))
 			},
 			err: genericError,
 		}),
@@ -170,15 +170,15 @@ var _ = Describe("eksctl API", func() {
 	},
 		Entry("fails to create the AWS provider", newClusterProviderEntry{
 			overwriteAWSProviderBuilderMock: func(pc *api.ProviderConfig, acl AWSConfigurationLoader) (api.ClusterProvider, error) {
-				return nil, fmt.Errorf(genericError)
+				return nil, fmt.Errorf("%v", genericError)
 			},
 			err: genericError,
 		}),
 		Entry("fails to validate auth", newClusterProviderEntry{
 			updateMocks: func(mp *mockprovider.MockProvider) {
 				_, _ = mp.STS().GetCallerIdentity(context.Background(), nil)
 				mp.MockSTS().On("GetCallerIdentity", mock.Anything, mock.Anything).Return(
-					nil, fmt.Errorf(genericError),
+					nil, fmt.Errorf("%v", genericError),
 				).Once()
 			},
 			err: fmt.Sprintf("checking AWS STS access – cannot get role ARN for current session: %s", genericError),

pkg/eks/api_test.go

@@ -184,7 +184,7 @@ func findKeyInEC2(ctx context.Context, ec2API awsapi.EC2, name string) (*ec2type
 		if errors.As(err, &ae) && ae.ErrorCode() == "InvalidKeyPair.NotFound" {
 			return nil, nil
 		}
-		return nil, errors.Wrapf(err, fmt.Sprintf("searching for SSH public key %q in EC2", name))
+		return nil, errors.Wrapf(err, "%s", fmt.Sprintf("searching for SSH public key %q in EC2", name))
 	}
 
 	if len(output.KeyPairs) != 1 {