From b2f2446b46bf02821d90ebedadae2bf7ae0e880e Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Mon, 5 Sep 2022 14:27:54 +0200
Subject: go.mod, vendor: update (#3358)

* go.mod, vendor: remove unnecessary dependencies

Commands:
1. go mod tidy
2. go mod vendor

* go.mod, vendor: update cloud.google.com/go

Commands:
1. go get -u cloud.google.com/go
2. go mod tidy
3. go mod vendor

* go.mod, vendor: update cloud.google.com/*

Commands:
1. go get -u cloud.google.com/storage cloud.google.com/logging
2. go mod tidy
3. go mod vendor

* go.mod, .golangci.yml, vendor: update *lint*

Commands:
1. go get -u golang.org/x/tools github.com/golangci/golangci-lint@v1.47.0
2. go mod tidy
3. go mod vendor
4. edit .golangci.yml to suppress new errors (resolved in the same PR later)

* all: fix lint errors

hash.go: copy() recommended by gosimple
parse.go: ent is never nil
verifier.go: signal.Notify() with unbuffered channel is bad. Have no idea why.

* .golangci.yml: adjust godot rules

check-all is deprecated, but still work
if you're hesitating too - I'll remove this commit
---
 .../charithe/durationcheck/durationcheck.go        | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'vendor/github.com/charithe/durationcheck/durationcheck.go')

diff --git a/vendor/github.com/charithe/durationcheck/durationcheck.go b/vendor/github.com/charithe/durationcheck/durationcheck.go
index 6eccd9c2a..c47b3a761 100644
--- a/vendor/github.com/charithe/durationcheck/durationcheck.go
+++ b/vendor/github.com/charithe/durationcheck/durationcheck.go
@@ -76,7 +76,7 @@ func check(pass *analysis.Pass) func(ast.Node) {
 }
 
 func isDuration(x types.Type) bool {
-	return x.String() == "time.Duration"
+	return x.String() == "time.Duration" || x.String() == "*time.Duration"
 }
 
 // isUnacceptableExpr returns true if the argument is not an acceptable time.Duration expression
@@ -94,9 +94,15 @@ func isUnacceptableExpr(pass *analysis.Pass, expr ast.Expr) bool {
 		return !isAcceptableNestedExpr(pass, e)
 	case *ast.SelectorExpr:
 		return !isAcceptableNestedExpr(pass, e)
+	case *ast.StarExpr:
+		return !isAcceptableNestedExpr(pass, e)
+	case *ast.ParenExpr:
+		return !isAcceptableNestedExpr(pass, e)
+	case *ast.IndexExpr:
+		return !isAcceptableNestedExpr(pass, e)
+	default:
+		return true
 	}
-
-	return true
 }
 
 // isAcceptableCast returns true if the argument is an acceptable expression cast to time.Duration
@@ -144,14 +150,23 @@ func isAcceptableNestedExpr(pass *analysis.Pass, n ast.Expr) bool {
 	case *ast.Ident:
 		return isAcceptableIdent(pass, e)
 	case *ast.CallExpr:
+		if isAcceptableCast(pass, e) {
+			return true
+		}
 		t := pass.TypesInfo.TypeOf(e)
 		return !isDuration(t)
 	case *ast.SelectorExpr:
+		return isAcceptableNestedExpr(pass, e.X) && isAcceptableIdent(pass, e.Sel)
+	case *ast.StarExpr:
+		return isAcceptableNestedExpr(pass, e.X)
+	case *ast.ParenExpr:
+		return isAcceptableNestedExpr(pass, e.X)
+	case *ast.IndexExpr:
 		t := pass.TypesInfo.TypeOf(e)
 		return !isDuration(t)
+	default:
+		return false
 	}
-
-	return false
 }
 
 func isAcceptableIdent(pass *analysis.Pass, ident *ast.Ident) bool {
-- 
cgit mrf-deployment