From 47eb078a7f8cc434f513144aa198180308ae7885 Mon Sep 17 00:00:00 2001
From: Vasco Guita <vasco.guita@tecnico.ulisboa.pt>
Date: Wed, 23 Nov 2022 14:08:53 +0100
Subject: [PATCH] Enable revive linter and solve issues

---
 .golangci.yaml                             | 1 -
 changelog/unreleased/enhancement-revive.md | 3 +++
 internal/http/services/ocmd/shares.go      | 2 +-
 pkg/app/provider/wopi/wopi.go              | 2 +-
 pkg/ocm/invite/manager/json/json.go        | 2 +-
 pkg/sysinfo/sysinfo.go                     | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-revive.md

diff --git a/.golangci.yaml b/.golangci.yaml
index e6b41a7da8..3dbe66cdf8 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -41,7 +41,6 @@ linters:
     - containedctx      # TODO: consider enabling the 'containedctx' linter to detect struct contained context.Context field.
     - whitespace        # TODO: consider enabling the 'whitespace' linter to detect leading and trailing whitespaces.
     - unparam           # TODO: consider enabling the 'unparam' linter to report unused function parameters.
-    - revive            # TODO: consider enabling the 'revive' linter to configure custom rules and define a strict preset for enhancing development & code review processes.
     - nakedret          # TODO: consider enabling the 'nakedret' linter to find naked returns in functions greater than a specified function length.
     - dupword           # TODO: consider enabling the 'dupword' linter to check for duplicate words in the source code.
     - makezero          # TODO: consider enabling the 'makezero' linter to find slice declarations with non-zero initial length.
diff --git a/changelog/unreleased/enhancement-revive.md b/changelog/unreleased/enhancement-revive.md
new file mode 100644
index 0000000000..2f0e8ed850
--- /dev/null
+++ b/changelog/unreleased/enhancement-revive.md
@@ -0,0 +1,3 @@
+Enhancement: Enable revive linter in golangci-lint and solve issues
+
+https://github.com/cs3org/reva/pull/3465
\ No newline at end of file
diff --git a/internal/http/services/ocmd/shares.go b/internal/http/services/ocmd/shares.go
index d4435d3b08..197ea8903c 100644
--- a/internal/http/services/ocmd/shares.go
+++ b/internal/http/services/ocmd/shares.go
@@ -141,7 +141,7 @@ func (h *sharesHandler) createShare(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var shareWithParts []string = strings.Split(shareWith, "@")
+	var shareWithParts = strings.Split(shareWith, "@")
 	userRes, err := gatewayClient.GetUser(ctx, &userpb.GetUserRequest{
 		UserId: &userpb.UserId{OpaqueId: shareWithParts[0]}, SkipFetchingUserGroups: true,
 	})
diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go
index 436d4d7463..1e172f16e1 100644
--- a/pkg/app/provider/wopi/wopi.go
+++ b/pkg/app/provider/wopi/wopi.go
@@ -161,7 +161,7 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc
 			q.Add("appviewurl", viewAppURL)
 		}
 	}
-	var access string = "edit"
+	var access = "edit"
 	if resource.GetSize() == 0 {
 		if _, ok := p.appURLs["editnew"]; ok {
 			access = "editnew"
diff --git a/pkg/ocm/invite/manager/json/json.go b/pkg/ocm/invite/manager/json/json.go
index 039a0c4ddf..9849e245d9 100644
--- a/pkg/ocm/invite/manager/json/json.go
+++ b/pkg/ocm/invite/manager/json/json.go
@@ -239,7 +239,7 @@ func (m *manager) ForwardInvite(ctx context.Context, invite *invitepb.InviteToke
 		if e != nil {
 			return errors.Wrap(e, "json: error reading request body")
 		}
-		return errors.Wrap(errors.New(fmt.Sprintf("%s: %s", resp.Status, string(respBody))), "json: error sending accept post request")
+		return errors.Wrap(fmt.Errorf("%s: %s", resp.Status, string(respBody)), "json: error sending accept post request")
 	}
 
 	return nil
diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go
index fc19764e20..c74156a4aa 100644
--- a/pkg/sysinfo/sysinfo.go
+++ b/pkg/sysinfo/sysinfo.go
@@ -34,7 +34,7 @@ type SystemInformation struct {
 
 var (
 	// SysInfo provides global system information.
-	SysInfo *SystemInformation = &SystemInformation{}
+	SysInfo = &SystemInformation{}
 )
 
 // ToJSON converts the system information to JSON.