From bea90fb62175758f864dd5e35ca7f8388d337e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= <contact@dwysokinski.me>
Date: Sun, 11 Dec 2022 17:59:46 +0000
Subject: [PATCH] fix: lint - p.Start is deprecated (#18)

Reviewed-on: https://gitea.dwysokinski.me/Kichiyaki/gootp/pulls/18
---
 .golangci.yml      | 57 ++++++++++++++++++++++++++++++++++++++++++----
 internal/andotp.go |  6 ++---
 main.go            |  2 +-
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 741ac8e..46cb483 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,13 +1,12 @@
 run:
   tests: true
+  timeout: 5m
 
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - depguard
-    - dupl
     - errcheck
     - gocritic
     - gofmt
@@ -19,19 +18,68 @@ linters:
     - nakedret
     - prealloc
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unused
-    - varcheck
     - lll
     - nestif
     - thelper
     - nonamedreturns
+    - gocyclo
+    - tenv
+    - testpackage
+    - noctx
+    - tparallel
+    - usestdlibvars
+    - unconvert
+    - makezero
+    - grouper
+    - errname
+    - exhaustive
+    - tagliatelle
 
 linters-settings:
   lll:
     line-length: 150
+  gocyclo:
+    min-complexity: 10
+  govet:
+    enable:
+      - asmdecl
+      - assign
+      - atomic
+      - atomicalign
+      - bools
+      - buildtag
+      - cgocall
+      - composites
+      - copylocks
+      - deepequalerrors
+      - errorsas
+      - findcall
+      - framepointer
+      - httpresponse
+      - ifaceassert
+      - loopclosure
+      - lostcancel
+      - nilfunc
+      - nilness
+      - printf
+      - reflectvaluecompare
+      - shadow
+      - shift
+      - sigchanyzer
+      - sortslice
+      - stdmethods
+      - stringintconv
+      - structtag
+      - testinggoroutine
+      - tests
+      - unmarshal
+      - unreachable
+      - unsafeptr
+      - unusedresult
+      - unusedwrite
 
 issues:
   exclude-rules:
@@ -39,6 +87,7 @@ issues:
     - path: _test\.go
       linters:
         - dupl
+        - gocyclo
     - linters:
         - lll
       source: "^//go:generate "
diff --git a/internal/andotp.go b/internal/andotp.go
index e1fb54f..70fb78f 100644
--- a/internal/andotp.go
+++ b/internal/andotp.go
@@ -34,11 +34,11 @@ func Encrypt(plaintext, password []byte) ([]byte, error) {
 
 	binary.BigEndian.PutUint32(iter, uint32(iterations))
 
-	if _, err := rand.Read(iv); err != nil {
+	if _, err = rand.Read(iv); err != nil {
 		return nil, fmt.Errorf("rand.Read(iv): %w", err)
 	}
 
-	if _, err := rand.Read(salt); err != nil {
+	if _, err = rand.Read(salt); err != nil {
 		return nil, fmt.Errorf("rand.Read(salt): %w", err)
 	}
 
@@ -119,7 +119,7 @@ func DecryptAsEntries(text, password []byte) ([]Entry, error) {
 	}
 
 	var entries []Entry
-	if err := json.Unmarshal(result, &entries); err != nil {
+	if err = json.Unmarshal(result, &entries); err != nil {
 		return nil, fmt.Errorf("json.Unmarshal: %w", err)
 	}
 
diff --git a/main.go b/main.go
index c9f61f3..0f58f3c 100644
--- a/main.go
+++ b/main.go
@@ -54,7 +54,7 @@ func newApp() (*cli.App, error) {
 			}
 
 			p := tea.NewProgram(internal.NewUI(entries), tea.WithAltScreen())
-			if err := p.Start(); err != nil {
+			if _, err := p.Run(); err != nil {
 				return fmt.Errorf("p.Start: %w", err)
 			}