🌱 fix lint issues on master (kubernetes-sigs#2316)

Author: camilamacedo86

pkg/cli/cmd_helpers.go

@@ -285,6 +285,7 @@ func (factory *executionHooksFactory) preRunEFunc(
 		}
 
 		// Pre-scaffold hook.
+		// nolint:revive
 		if err := factory.forEach(func(subcommand plugin.Subcommand) error {
 			if subcommand, hasPreScaffold := subcommand.(plugin.HasPreScaffold); hasPreScaffold {
 				return subcommand.PreScaffold(factory.fs)
@@ -302,6 +303,7 @@ func (factory *executionHooksFactory) preRunEFunc(
 func (factory *executionHooksFactory) runEFunc() func(*cobra.Command, []string) error {
 	return func(*cobra.Command, []string) error {
 		// Scaffold hook.
+		// nolint:revive
 		if err := factory.forEach(func(subcommand plugin.Subcommand) error {
 			return subcommand.Scaffold(factory.fs)
 		}, "unable to scaffold with"); err != nil {
@@ -321,6 +323,7 @@ func (factory *executionHooksFactory) postRunEFunc() func(*cobra.Command, []stri
 		}
 
 		// Post-scaffold hook.
+		// nolint:revive
 		if err := factory.forEach(func(subcommand plugin.Subcommand) error {
 			if subcommand, hasPostScaffold := subcommand.(plugin.HasPostScaffold); hasPostScaffold {
 				return subcommand.PostScaffold()

pkg/machinery/scaffold.go

@@ -370,10 +370,7 @@ func filterExistingValues(content string, codeFragmentsMap CodeFragmentsMap) err
 			}
 		}
 	}
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-	return nil
+	return scanner.Err()
 }
 
 func insertStrings(content string, codeFragmentsMap CodeFragmentsMap) ([]byte, error) {

pkg/model/resource/resource.go

@@ -179,11 +179,8 @@ func (r *Resource) Update(other Resource) error {
 	if r.Webhooks == nil && other.Webhooks != nil {
 		r.Webhooks = &Webhooks{}
 	}
-	if err := r.Webhooks.Update(other.Webhooks); err != nil {
-		return err
-	}
 
-	return nil
+	return r.Webhooks.Update(other.Webhooks)
 }
 
 func wrapKey(key string) string {

pkg/plugins/common/kustomize/v1/init.go

@@ -97,9 +97,5 @@ func (p *initSubcommand) InjectConfig(c config.Config) error {
 func (p *initSubcommand) Scaffold(fs machinery.Filesystem) error {
 	scaffolder := scaffolds.NewInitScaffolder(p.config)
 	scaffolder.InjectFS(fs)
-	if err := scaffolder.Scaffold(); err != nil {
-		return err
-	}
-
-	return nil
+	return scaffolder.Scaffold()
 }

pkg/plugins/golang/v3/init.go

@@ -104,11 +104,8 @@ func (p *initSubcommand) InjectConfig(c config.Config) error {
 		}
 		p.repo = repoPath
 	}
-	if err := p.config.SetRepository(p.repo); err != nil {
-		return err
-	}
 
-	return nil
+	return p.config.SetRepository(p.repo)
 }
 
 func (p *initSubcommand) PreScaffold(machinery.Filesystem) error {
@@ -120,11 +117,7 @@ func (p *initSubcommand) PreScaffold(machinery.Filesystem) error {
 	}
 
 	// Check if the current directory has not files or directories which does not allow to init the project
-	if err := checkDir(); err != nil {
-		return err
-	}
-
-	return nil
+	return checkDir()
 }
 
 func (p *initSubcommand) Scaffold(fs machinery.Filesystem) error {

test/e2e/utils/kubectl.go

@@ -131,10 +131,7 @@ func (v *KubernetesVersion) prepare() (err error) {
 	if err = v.ClientVersion.parseVersionInts(); err != nil {
 		return err
 	}
-	if err = v.ServerVersion.parseVersionInts(); err != nil {
-		return err
-	}
-	return nil
+	return v.ServerVersion.parseVersionInts()
 }
 
 // Version is a func to run kubectl version command

test/e2e/utils/test_context.go

@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/onsi/ginkgo" //nolint:golint
+	. "github.com/onsi/ginkgo" //nolint:golint,revive
 )
 
 // TestContext specified to run e2e tests

test/e2e/v2/plugin_cluster_test.go

@@ -25,8 +25,12 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/onsi/ginkgo" //nolint:golint
-	. "github.com/onsi/gomega" //nolint:golint
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/ginkgo"
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
 )

test/e2e/v3/generate_test.go

@@ -22,8 +22,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/onsi/ginkgo" //nolint:golint
-	. "github.com/onsi/gomega" //nolint:golint
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/ginkgo"
+
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
 )

test/e2e/v3/plugin_cluster_test.go

@@ -25,8 +25,13 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/onsi/ginkgo" //nolint:golint
-	. "github.com/onsi/gomega" //nolint:golint
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/ginkgo"
+
+	//nolint:golint
+	//nolint:revive
+	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
 )