Merge pull request #3942 from butonic/bump-linter

bump golangci-lint to v1.53.2
cs3org · Jun 6, 2023 · ce240aa · ce240aa
2 parents 0dda564 + ab768fa
commit ce240aa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ toolchain-clean:
 
 $(GOLANGCI_LINT):
 	@mkdir -p $(@D)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINDIR=$(@D) sh -s v1.50.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINDIR=$(@D) sh -s v1.53.2
 
 .PHONY: check-changelog
 lint: $(GOLANGCI_LINT)

diff --git a/internal/http/services/owncloud/ocs/conversions/main.go b/internal/http/services/owncloud/ocs/conversions/main.go
@@ -345,7 +345,7 @@ func ParseTimestamp(timestampString string) (*types.Timestamp, error) {
 		parsedTime, err = time.Parse("2006-01-02", timestampString)
 		if err == nil {
 			// the link needs to be valid for the whole day
-			parsedTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
+			parsedTime = parsedTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
 		}
 	}
 	if err != nil {

diff --git a/pkg/storage/utils/decomposedfs/node/node.go b/pkg/storage/utils/decomposedfs/node/node.go
@@ -1039,7 +1039,6 @@ func (n *Node) ReadUserPermissions(ctx context.Context, u *userpb.User) (ap prov
 			}
 			AddPermissions(&ap, g.GetPermissions())
 		case metadata.IsAttrUnset(err):
-			err = nil
 			appctx.GetLogger(ctx).Error().Interface("node", n).Str("grant", grantees[i]).Interface("grantees", grantees).Msg("grant vanished from node after listing")
 			// continue with next segment
 		default: