address comments; bring back timeout and revive

Author: sebrandon1

.golangci.yml

@@ -1,5 +1,6 @@
 version: "2"
 run:
+  timeout: 10m
   build-tags:
     - build
     - containers_image_openpgp
@@ -9,28 +10,20 @@ linters:
     - gosec
     - misspell
     - errcheck
-    - gofmt
     - gosec
-    - goimports
-    # - revive  # revive is flagging ginkgo and gomega dot-imports
+    - revive
+  disable:
+    - dotimports
   exclusions:
     generated: lax
     presets:
       - comments
       - common-false-positives
       - legacy
       - std-error-handling
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
 formatters:
   enable:
     - gofmt
     - goimports
   exclusions:
     generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$

cmd/crc-embedder/cmd/embed.go

@@ -88,13 +88,13 @@ func embedFiles(executablePath string, filenames []string) error {
 		logging.Debugf("Embedding %s in %s", filename, executablePath)
 		f, err := os.Open(filename) // #nosec G304
 		if err != nil {
-			return fmt.Errorf("Failed to open %s: %v", filename, err)
+			return fmt.Errorf("failed to open %s: %v", filename, err)
 		}
 		defer f.Close()
 
 		err = appender.AppendStreamReader(path.Base(filename), f, false)
 		if err != nil {
-			return fmt.Errorf("Failed to append %s to %s: %v", filename, executablePath, err)
+			return fmt.Errorf("failed to append %s to %s: %v", filename, executablePath, err)
 		}
 	}
 

cmd/crc/cmd/config/get.go

@@ -16,13 +16,13 @@ func configGetCmd(config config.Storage) *cobra.Command {
 		Long:  `Gets a crc configuration property.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
-				return errors.New("Please provide a configuration property to get")
+				return errors.New("please provide a configuration property to get")
 			}
 			key := args[0]
 
 			v := config.Get(key)
 			if v.Invalid {
-				return fmt.Errorf("Configuration property '%s' does not exist", key)
+				return fmt.Errorf("configuration property '%s' does not exist", key)
 			}
 
 			telemetry.SetConfigurationKey(cmd.Context(), args[0])

cmd/crc/cmd/config/set.go

@@ -17,7 +17,7 @@ func configSetCmd(config *config.Config) *cobra.Command {
 CONFIG-KEYS: ` + "\n\n" + configurableFields(config),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 2 {
-				return errors.New("Please provide a configuration property and its value as in 'crc config set KEY VALUE'")
+				return errors.New("please provide a configuration property and its value as in 'crc config set KEY VALUE'")
 			}
 			setMessage, err := config.Set(args[0], args[1])
 			if err != nil {

cmd/crc/cmd/config/unset.go

@@ -16,7 +16,7 @@ func configUnsetCmd(config config.Storage) *cobra.Command {
 		Long:  `Unsets a crc configuration property.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
-				return errors.New("Please provide a configuration property to unset")
+				return errors.New("please provide a configuration property to unset")
 			}
 			unsetMessage, err := config.Unset(args[0])
 			if err != nil {

cmd/crc/cmd/console.go

@@ -93,14 +93,14 @@ func (s *consoleResult) prettyPrintTo(writer io.Writer) error {
 	}
 
 	if s.state != state.Running {
-		return errors.New("The OpenShift cluster is not running, cannot open the OpenShift Web Console")
+		return errors.New("the OpenShift cluster is not running, cannot open the OpenShift Web Console")
 	}
 
 	if _, err := fmt.Fprintln(writer, "Opening the OpenShift Web Console in the default browser..."); err != nil {
 		return err
 	}
 	if err := browser.OpenURL(s.ClusterConfig.WebConsoleURL); err != nil {
-		return fmt.Errorf("Failed to open the OpenShift Web Console, you can access it by opening %s in your web browser", s.ClusterConfig.WebConsoleURL)
+		return fmt.Errorf("failed to open the OpenShift Web Console, you can access it by opening %s in your web browser", s.ClusterConfig.WebConsoleURL)
 	}
 
 	return nil

cmd/crc/cmd/oc_env.go

@@ -24,7 +24,7 @@ var ocEnvCmd = &cobra.Command{
 func runOcEnv(_ []string) error {
 	userShell, err := shell.GetShell(forceShell)
 	if err != nil {
-		return fmt.Errorf("Error running the oc-env command: %s", err.Error())
+		return fmt.Errorf("error running the oc-env command: %s", err.Error())
 	}
 
 	client := newMachine()

cmd/crc/cmd/podman_env.go

@@ -25,7 +25,7 @@ var podmanEnvCmd = &cobra.Command{
 func runPodmanEnv() error {
 	userShell, err := shell.GetShell(forceShell)
 	if err != nil {
-		return fmt.Errorf("Error running the podman-env command: %s", err.Error())
+		return fmt.Errorf("error running the podman-env command: %s", err.Error())
 	}
 
 	client := newMachine()

pkg/compress/compress_test.go

@@ -84,7 +84,7 @@ func checkFileList(destDir string, extractedFiles []string, expectedFiles fileMa
 		}
 		_, found := expectedFiles[rel]
 		if !found {
-			return fmt.Errorf("Unexpected file '%s' in file list %v", rel, expectedFiles)
+			return fmt.Errorf("unexpected file '%s' in file list %v", rel, expectedFiles)
 		}
 		delete(expectedFiles, rel)
 	}
@@ -117,7 +117,7 @@ func checkFiles(destDir string, files fileMap) error {
 		}
 		expectedContent, found := files[archivePath]
 		if !found {
-			return fmt.Errorf("Unexpected extracted file '%s'", path)
+			return fmt.Errorf("unexpected extracted file '%s'", path)
 		}
 		delete(files, archivePath)
 
@@ -126,7 +126,7 @@ func checkFiles(destDir string, files fileMap) error {
 			return err
 		}
 		if string(data) != expectedContent {
-			return fmt.Errorf("Unexpected content for '%s': expected [%s], got [%s]", path, expectedContent, string(data))
+			return fmt.Errorf("unexpected content for '%s': expected [%s], got [%s]", path, expectedContent, string(data))
 		}
 		logging.Debugf("'%s' successfully checked", path)
 		return nil

pkg/crc/api/api_http_test.go

@@ -178,12 +178,12 @@ var testCases = []testCase{
 	{
 		request:     post("start"),
 		failRequest: true,
-		response:    httpError(500).withBody("Failed to start\n"),
+		response:    httpError(500).withBody("failed to start\n"),
 	},
 	{
 		request:     get("start"),
 		failRequest: true,
-		response:    httpError(500).withBody("Failed to start\n"),
+		response:    httpError(500).withBody("failed to start\n"),
 	},
 
 	// stop