Merge pull request tinkerbell#14 from tstromberg/gofumpt2

Enable gofumpt and gosec

Author: tstromberg

.golangci.yml

@@ -18,6 +18,12 @@ linters-settings:
     min-occurrences: 5
     ignore-tests: true
 
+  gosec:
+    excludes:
+      - G107 # Potential HTTP request made with variable url
+      - G204 # Subprocess launched with function call as argument or cmd arguments
+      - G404 # Use of weak random number generator (math/rand instead of crypto/rand
+
   errorlint:
     # these are still common in Go: for instance, exit errors.
     asserts: false
@@ -108,6 +114,8 @@ linters:
     - gocritic
     - godot
     - gofmt
+    - gofumpt
+    - gosec
     - goheader
     - goimports
     - goprintffuncname
@@ -158,8 +166,6 @@ linters:
   # - maligned
   # - prealloc "For most programs usage of prealloc will be a premature optimization."
   # Disabled linters due to bad error messages or bugs
-  # - gofumpt
-  # - gosec
   # - tagliatelle
 
 issues:

lint-install.go

@@ -128,7 +128,7 @@ func updateMakefile(root string, cfg Config, dryRun bool) (string, error) {
 	edits := myers.ComputeEdits("Makefile", string(existing), string(proposed))
 	change := gotextdiff.ToUnified(filepath.Base(dest), filepath.Base(dest), string(existing), edits)
 	if !dryRun {
-		if err := os.WriteFile(dest, proposed, 0755); err != nil {
+		if err := os.WriteFile(dest, proposed, 0o600); err != nil {
 			return "", err
 		}
 	}
@@ -154,7 +154,7 @@ func updateGoLint(root string, dryRun bool) (string, error) {
 	change := gotextdiff.ToUnified(filepath.Base(dest), filepath.Base(dest), string(existing), edits)
 
 	if !dryRun {
-		if err := os.WriteFile(dest, goLintConfig, 0755); err != nil {
+		if err := os.WriteFile(dest, goLintConfig, 0o600); err != nil {
 			return "", err
 		}
 	}
@@ -176,7 +176,6 @@ func goLintCmd(root string, level string) string {
 		},
 		Unsorted: true,
 	})
-
 	if err != nil {
 		klog.Errorf("unable to find go.mod files: %v", err)
 	}