Fix linter golint

cmd/operator-sdk/add/api.go

@@ -36,7 +36,7 @@ var (
 	skipGeneration bool
 )
 
-func newAddApiCmd() *cobra.Command {
+func newAddAPICmd() *cobra.Command {
 	apiCmd := &cobra.Command{
 		Use:   "api",
 		Short: "Adds a new api definition under pkg/apis",

cmd/operator-sdk/add/cmd.go

@@ -25,7 +25,7 @@ func NewCmd() *cobra.Command {
 		Long:  "",
 	}
 
-	cmd.AddCommand(newAddApiCmd())
+	cmd.AddCommand(newAddAPICmd())
 	cmd.AddCommand(newAddControllerCmd())
 	cmd.AddCommand(newAddCRDCmd())
 	return cmd

cmd/operator-sdk/new/cmd.go

@@ -35,7 +35,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
-func NewCmd() *cobra.Command {
+func NewCmd() *cobra.Command { //nolint:golint
+	/*
+		The nolint here is used to hide the warning
+		"func name will be used as new.NewCmd by other packages,
+		and that stutters; consider calling this Cmd"
+		which is a false positive.
+	*/
 	newCmd := &cobra.Command{
 		Use:   "new <project-name>",
 		Short: "Creates a new operator application",

cmd/operator-sdk/scorecard/cmd.go

@@ -32,7 +32,7 @@ func NewCmd() *cobra.Command {
 		Short: "Run scorecard tests",
 		Long: `Runs blackbox scorecard tests on an operator
 `,
-		RunE: scorecard.ScorecardTests,
+		RunE: scorecard.Tests,
 	}
 
 	scorecardCmd.Flags().String(scorecard.ConfigOpt, "", fmt.Sprintf("config file (default is '<project_dir>/%s'; the config file's extension and format can be .yaml, .json, or .toml)", scorecard.DefaultConfigFile))

hack/tests/check-lint.sh

@@ -6,7 +6,6 @@ source ./hack/common.sh
 DEV_LINTERS=(
     ##todo(camilamacedo86): The following checks requires fixes in the code.
     ##todo(camilamacedo86): they should be enabled and added in the CI
-    "--enable=golint"
     "--enable=gocyclo"
     "--enable=lll"
     "--enable=gosec"  # NOT add this one to CI since was defined that it should be optional for now at least.
@@ -45,4 +44,5 @@ golangci-lint run --disable-all \
     --enable=errcheck \
     --enable=dupl \
     --enable=unparam \
+    --enable=golint \
     ${LINTERS[@]}

internal/flags/watch/flags.go

@@ -23,7 +23,13 @@ import (
 
 // WatchFlags provides flag for configuration of a controller's reconcile period and for a
 // watches.yaml file, which is used to configure dynamic operators (e.g. Ansible and Helm).
-type WatchFlags struct {
+type WatchFlags struct { //nolint:golint
+	/*
+		The nolint is regards to: type name will be used as watch.WatchFlags by other packages, and that stutters; consider calling this Flags (golint)
+		todo(camilamacedo86): Note that we decided to not introduce breakchanges to add the linters and it should be done after.
+		From @joelanford: Even though watch.WatchFlags is an internal type, it is embedded in exported types, which means that changing it to watch.Flags is a breaking change.
+	*/
+
 	ReconcilePeriod time.Duration
 	WatchesFile     string
 }

internal/scaffold/add_controller_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestAddController(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/addtoscheme_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestAddToScheme(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/ansible/constants.go

@@ -27,5 +27,5 @@ const (
 	MoleculeTestLocalDir   = MoleculeDir + filePathSep + "test-local"
 )
 
-// Arrays can't be constants but this should be a constant
+// AnsibleDelims is a slice of two strings representing the left and right delimiters for ansible templates. Arrays can't be constants but this should be a constant.
 var AnsibleDelims = [2]string{"[[", "]]"}

internal/scaffold/controller_kind_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestControllerKind(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/cr_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestCR(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -38,7 +38,7 @@ func TestCR(t *testing.T) {
 }
 
 func TestCRCustomSpec(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/crd_test.go

@@ -127,7 +127,7 @@ func TestCRDNonGoProjectDefault(t *testing.T) {
 	s, buf := setupScaffoldAndWriter()
 	s.Fs = afero.NewMemMapFs()
 
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -174,7 +174,7 @@ func TestCRDNonGoProjectCustom(t *testing.T) {
 	s, buf := setupScaffoldAndWriter()
 	s.Fs = afero.NewMemMapFs()
 
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/doc_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestDoc(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/helm/chart_test.go

@@ -42,7 +42,7 @@ func TestCreateChart(t *testing.T) {
 		latestVersion      = "1.2.3"
 		previousVersion    = "1.2.0"
 		nonExistentVersion = "0.0.1"
-		customApiVersion   = "example.com/v1"
+		customAPIVersion   = "example.com/v1"
 		customKind         = "MyApp"
 		customExpectName   = "myapp"
 		expectDerivedKind  = "TestChart"
@@ -111,9 +111,9 @@ func TestCreateChart(t *testing.T) {
 		},
 		{
 			name:               "from scaffold with apiVersion and kind",
-			apiVersion:         customApiVersion,
+			apiVersion:         customAPIVersion,
 			kind:               customKind,
-			expectResource:     mustNewResource(t, customApiVersion, customKind),
+			expectResource:     mustNewResource(t, customAPIVersion, customKind),
 			expectChartName:    customExpectName,
 			expectChartVersion: "0.1.0",
 		},
@@ -148,8 +148,8 @@ func TestCreateChart(t *testing.T) {
 		{
 			name:               "from repo and name implicit latest with apiVersion",
 			helmChart:          latest.repoAndName,
-			apiVersion:         customApiVersion,
-			expectResource:     mustNewResource(t, customApiVersion, expectDerivedKind),
+			apiVersion:         customAPIVersion,
+			expectResource:     mustNewResource(t, customAPIVersion, expectDerivedKind),
 			expectChartName:    chartName,
 			expectChartVersion: latestVersion,
 		},
@@ -164,9 +164,9 @@ func TestCreateChart(t *testing.T) {
 		{
 			name:               "from repo and name implicit latest with apiVersion and kind",
 			helmChart:          latest.repoAndName,
-			apiVersion:         customApiVersion,
+			apiVersion:         customAPIVersion,
 			kind:               customKind,
-			expectResource:     mustNewResource(t, customApiVersion, customKind),
+			expectResource:     mustNewResource(t, customAPIVersion, customKind),
 			expectChartName:    chartName,
 			expectChartVersion: latestVersion,
 		},
@@ -301,10 +301,9 @@ func runTestCase(t *testing.T, testDir string, tc createChartTestCase) {
 	if tc.expectErr {
 		assert.Error(t, err)
 		return
-	} else {
-		assert.NoError(t, err)
 	}
 
+	assert.NoError(t, err)
 	assert.Equal(t, tc.expectResource, resource)
 	assert.Equal(t, tc.expectChartName, chart.GetMetadata().GetName())
 	assert.Equal(t, tc.expectChartVersion, chart.GetMetadata().GetVersion())

internal/scaffold/olm-catalog/csv.go

@@ -326,13 +326,13 @@ func (s *CSV) updateCSVVersions(csv *olmapiv1alpha1.ClusterServiceVersion) error
 
 // updateCSVFromManifestFiles gathers relevant data from generated and
 // user-defined manifests and updates csv.
-func (g *CSV) updateCSVFromManifests(cfg *CSVConfig, csv *olmapiv1alpha1.ClusterServiceVersion) (err error) {
+func (s *CSV) updateCSVFromManifests(cfg *CSVConfig, csv *olmapiv1alpha1.ClusterServiceVersion) (err error) {
 	paths := append(cfg.CRDCRPaths, cfg.OperatorPath)
 	paths = append(paths, cfg.RolePaths...)
 	manifestGVKMap := map[schema.GroupVersionKind][][]byte{}
 	crGVKSet := map[schema.GroupVersionKind]struct{}{}
 	for _, path := range paths {
-		info, err := g.getFS().Stat(path)
+		info, err := s.getFS().Stat(path)
 		if err != nil {
 			return err
 		}

internal/scaffold/register_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestRegister(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scaffold/test_setup.go

@@ -30,7 +30,7 @@ const (
 	// test constants describing an app operator project
 	appProjectName = "app-operator"
 	appRepo        = "github.com/example-inc/" + appProjectName
-	appApiVersion  = "app.example.com/v1alpha1"
+	appAPIVersion  = "app.example.com/v1alpha1"
 	appKind        = "AppService"
 )
 

internal/scaffold/types_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func TestTypes(t *testing.T) {
-	r, err := NewResource(appApiVersion, appKind)
+	r, err := NewResource(appAPIVersion, appKind)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/scorecard/scorecard.go

@@ -105,7 +105,7 @@ func getPlugins(version string, selector labels.Selector) ([]Plugin, error) {
 	return plugins, nil
 }
 
-func ScorecardTests(cmd *cobra.Command, args []string) error {
+func Tests(cmd *cobra.Command, args []string) error {
 	if err := initConfig(); err != nil {
 		return err
 	}

pkg/ansible/paramconv/paramconv.go

@@ -83,10 +83,10 @@ func ToSnake(s string) string {
 	}
 	bits := []string{}
 	n := ""
-	real_i := -1
+	iReal := -1
 
 	for i, v := range s {
-		real_i += 1
+		iReal++
 		// treat acronyms as words, eg for JSONData -> JSON is a whole word
 		nextCaseIsChanged := false
 		if i+1 < len(s) {
@@ -96,22 +96,22 @@ func ToSnake(s string) string {
 			}
 		}
 
-		if real_i > 0 && n[len(n)-1] != '_' && nextCaseIsChanged {
+		if iReal > 0 && n[len(n)-1] != '_' && nextCaseIsChanged {
 			// add underscore if next letter case type is changed
 			if v >= 'A' && v <= 'Z' {
 				bits = append(bits, strings.ToLower(n))
 				n = string(v)
-				real_i = 0
+				iReal = 0
 			} else if v >= 'a' && v <= 'z' {
 				bits = append(bits, strings.ToLower(n+string(v)))
 				n = ""
-				real_i = -1
+				iReal = -1
 			}
 		} else if v == ' ' || v == '_' || v == '-' {
 			// replace spaces/underscores with delimiters
 			bits = append(bits, strings.ToLower(n))
 			n = ""
-			real_i = -1
+			iReal = -1
 		} else {
 			n = n + string(v)
 		}

pkg/ansible/runner/internal/inputdir/inputdir.go

@@ -135,8 +135,8 @@ func (i *InputDir) Write() error {
 	// ANSIBLE_INVENTORY takes precedence over our generated hosts file
 	// so if the envvar is set we don't bother making it, we just copy
 	// the inventory into our runner directory
-	ansible_inventory := os.Getenv("ANSIBLE_INVENTORY")
-	if ansible_inventory == "" {
+	ansibleInventory := os.Getenv("ANSIBLE_INVENTORY")
+	if ansibleInventory == "" {
 		// If ansible-runner is running in a python virtual environment, propagate
 		// that to ansible.
 		venv := os.Getenv("VIRTUAL_ENV")
@@ -151,18 +151,18 @@ func (i *InputDir) Write() error {
 			return err
 		}
 	} else {
-		fi, err := os.Stat(ansible_inventory)
+		fi, err := os.Stat(ansibleInventory)
 		if err != nil {
 			return err
 		}
 		switch mode := fi.Mode(); {
 		case mode.IsDir():
-			err = i.copyInventory(ansible_inventory, filepath.Join(i.Path, "inventory"))
+			err = i.copyInventory(ansibleInventory, filepath.Join(i.Path, "inventory"))
 			if err != nil {
 				return err
 			}
 		case mode.IsRegular():
-			err = i.copyInventory(ansible_inventory, filepath.Join(i.Path, "inventory/hosts"))
+			err = i.copyInventory(ansibleInventory, filepath.Join(i.Path, "inventory/hosts"))
 			if err != nil {
 				return err
 			}

pkg/apis/scorecard/formatting.go

@@ -22,6 +22,8 @@ import (
 var _ ScorecardFormatter = &scapiv1alpha1.ScorecardOutput{}
 var _ ScorecardFormatter = &scapiv1alpha2.ScorecardOutput{}
 
-type ScorecardFormatter interface {
+type ScorecardFormatter interface { //nolint:golint
+	// todo(camilamacedo86): The no lint here is for pkg/apis/scorecard/formatting.go:25:6: type name will be used as scorecard.ScorecardFormatter by other packages, and that stutters; consider calling this Formatter (golint)
+	// However, was decided to not move forward with it now in order to not introduce breakchanges with the task to add the linter. We should to do it after.
 	MarshalText() (string, error)
 }

pkg/k8sutil/k8sutil.go

@@ -149,7 +149,7 @@ func GetGVKsFromAddToScheme(addToSchemeFunc func(*runtime.Scheme) error) ([]sche
 	}
 	schemeAllKnownTypes := s.AllKnownTypes()
 	ownGVKs := []schema.GroupVersionKind{}
-	for gvk, _ := range schemeAllKnownTypes {
+	for gvk := range schemeAllKnownTypes {
 		if !isKubeMetaKind(gvk.Kind) {
 			ownGVKs = append(ownGVKs, gvk)
 		}

pkg/leader/leader.go

@@ -81,9 +81,8 @@ func Become(ctx context.Context, lockName string) error {
 				log.Info("Found existing lock with my name. I was likely restarted.")
 				log.Info("Continuing as the leader.")
 				return nil
-			} else {
-				log.Info("Found existing lock", "LockOwner", existingOwner.Name)
 			}
+			log.Info("Found existing lock", "LockOwner", existingOwner.Name)
 		}
 	case apierrors.IsNotFound(err):
 		log.Info("No pre-existing lock was found.")

pkg/test/context.go

@@ -25,7 +25,9 @@ import (
 	"k8s.io/client-go/restmapper"
 )
 
-type TestCtx struct {
+type TestCtx struct { //nolint:golint
+	// todo(camilamacedo86): The no lint here is for type name will be used as test.TestCtx by other packages, and that stutters; consider calling this Ctx (golint)
+	// However, was decided to not move forward with it now in order to not introduce breakchanges with the task to add the linter. We should to do it after.
 	id         string
 	cleanupFns []cleanupFn
 	namespace  string